summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* minor changesStephan Bösebeck2016-03-242-1113/+1111
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2498-41441/+33775
|\
| * Merge pull request #210 from n0bs/masterJack Humbert2016-03-232-16/+12
| |\
| | * Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2016-03-232-16/+12
| |/
| * Merge pull request #209 from n0bs/masterJack Humbert2016-03-236-0/+332
| |\
| | * Added files for Bantam-44Norberto Monarrez2016-03-236-0/+332
| * | Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert2016-03-231-5/+65
| |\ \ | | |/ | |/|
| | * Added layout diagrams to the default planck keymapAlex Ives2016-03-161-5/+65
| * | Merge pull request #199 from IBNobody/masterJack Humbert2016-03-2211-6/+420
| |\ \
| | * | Fixed extra semicolons.IBNobody2016-03-222-9/+6
| | * | Fixed LED Function CallsIBNobody2016-03-224-34/+22
| | * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2288-41597/+34428
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #190 from yoyoerx/function_pointersErez Zukerman2016-03-2282-41462/+33034
| |\ \ \
| | * \ \ Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2115-2579/+4317
| | |\ \ \ | | |/ / / | |/| | |
| | * | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1133-41292/+32894
| | * | | Merge branch 'function_pointers' of github.com:yoyoerx/qmk_keyboard into func...yoyoerx2016-03-100-0/+0
| | |\ \ \
| | | * | | Addressed void* return warning & coding styleyoyoerx2016-03-099-63/+45
| | * | | | Addressed void* return warning in all keymapsyoyoerx2016-03-1048-179/+148
| | |/ / /
| | | * | Adding Retro_Refit KeyboardIBNobody2016-03-166-0/+400
| | | * | Removing Teensy SDK FolderIBNobody2016-03-161-0/+0
| | | * | Adding LED function pointersIBNobody2016-03-154-6/+38
| | | |/
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-224-0/+1309
|\| | |
| * | | Merge pull request #205 from romanzolotarev/masterErez Zukerman2016-03-214-0/+1309
| |\ \ \
| | * | | Update readmeRoman Zolotarev2016-03-191-1/+1
| | * | | Update layoutRoman Zolotarev2016-03-1912-192/+67
| | * | | Swap volup and voldownRoman Zolotarev2016-03-181-2/+2
| | * | | Add Roman's LayoutRoman Zolotarev2016-03-1811-0/+1434
| | | |/ | | |/|
* | | | fix number pad, add ,Stephan Bösebeck2016-03-201-1/+1
* | | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ...Stephan Bösebeck2016-03-201-4/+4
* | | | tweaking it a bit further, fixing thingsStephan Bösebeck2016-03-201-12/+12
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2011-2963/+3391
|\| | |
| * | | Merge pull request #203 from XenoBits/masterErez Zukerman2016-03-205-1227/+1174
| |\ \ \
| | * | | Fixed png imageMaxime Millet2016-03-201-0/+0
| | * | | CSharp dev layout V2Maxime Millet2016-03-205-1227/+1174
| * | | | Merge pull request #201 from uzytkownik/masterErez Zukerman2016-03-202-1497/+1503
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add waits to prevent KVM from hangingMaciej Piechotka2016-03-172-1490/+1492
| | * | | Put frequently used keys in shell (-=) under thumbMaciej Piechotka2016-03-172-9/+9
| | * | | Add missing breaks in mpiechotka ergodox_ez keyboardMaciej Piechotka2016-03-172-1233/+1237
| |/ / /
| * | | Merge pull request #194 from DidierLoiseau/bépo-keymap-headerJack Humbert2016-03-141-0/+311
| |\ \ \
| | * | | Keymap header for the BÉPO layoutDidier Loiseau2016-03-131-0/+311
| * | | | Merge pull request #195 from krid78/masterJack Humbert2016-03-141-2/+2
| |\ \ \ \
| | * | | | fixes an obvious typo to have DE_LCBR produce {Daniel Kriesten2016-03-141-2/+2
| | |/ / /
| * | | | Merge pull request #197 from yoyoerx/windocsJack Humbert2016-03-141-6/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Cygwin Based Users Guide v0.6 -fixes to dfu-programmer buildyoyoerx2016-03-141-6/+8
| |/ / /
| * | | Merge pull request #192 from mitchlloyd/mitch-layoutJack Humbert2016-03-101-0/+49
| |\ \ \
| | * | | First keyboard layoutMitch Lloyd2016-03-101-0/+49
| |/ / /
| * | | Merge pull request #191 from yoyoerx/windocsJack Humbert2016-03-101-347/+350
| |\ \ \
| | * \ \ Merge remote-tracking branch 'qmk/master' into windocsyoyoerx2016-03-101-27/+24
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #187 from yoyoerx/windocsJack Humbert2016-03-091-18/+128
| |\ \ \ \ | | |_|_|/ | |/| | |
| | | * | Cygwin Based Users Guide v0.5 -further correctionsyoyoerx2016-03-091-347/+353
| | |/ /