summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-03-3072-1922/+4408
|\
| * Merge pull request #227 from NoahAndrews/patch-4Jack Humbert2016-03-301-2/+2
| |\
| | * Fixed minor issues with Preonic readmeNoah Andrews2016-03-301-2/+2
| * | Tiny fix of Planck diagramsMiha Rekar2016-03-301-2/+2
| |/
| * preonic readmeJack Humbert2016-03-301-9/+3
| * Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-03-30155-41700/+38531
| |\
| | * Updated several keyboard folders to use new keymap naming schemeNoah Andrews2016-03-2939-40/+40
| | * Fix error in Planck makefile commentNoah Andrews2016-03-291-1/+1
| | * Merge pull request #216 from msc654/masterErez Zukerman2016-03-286-0/+1334
| | |\
| | | * Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| | | * Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| | * | Merge pull request #214 from cdlm/action-hookJack Humbert2016-03-282-15/+18
| | |\ \
| | | * | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-282-15/+18
| | | |/
| | * / Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-282-13/+57
| | |/
| * | .hex filesJack Humbert2016-03-303-2/+2893
| * | preonic updateJack Humbert2016-03-3019-1844/+64
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-03-2827-1153/+3708
|\ \ \ | | |/ | |/|
| * | Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-2710-1147/+1232
| |\ \
| | * \ Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-03-261-1/+5
| | |\ \
| | * | | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-2610-1109/+1192
| | * | | The Ordinary Layout is familiar to users of common keyboardsNicholas Keene2016-03-241-58/+60
| * | | | Merge pull request #196 from naps62/naps62Erez Zukerman2016-03-273-0/+1690
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Adds naps62's layoutMiguel Palhas2016-03-153-0/+1690
| * | | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-251-1/+5
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add important note about brightness on OS XRoman Zolotarev2016-03-221-1/+5
| * | | | 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
| * | | | | Fixed LED Function CallsIBNobody2016-03-222-24/+12
| * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2284-41564/+34408
| |\ \ \ \ \
| * | | | | | Adding Retro_Refit KeyboardIBNobody2016-03-166-0/+400
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-03-2290-40507/+35256
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2113-2577/+4004
| |\ \ \ \ \
| | * \ \ \ \ 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
| | | |/ / /
| | * | | | 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
| | * | | | | 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
| | | |/ / / | | |/| | |
| | * | | | Cygwin Based Users Guide v0.6 -fixes to dfu-programmer buildyoyoerx2016-03-141-6/+8
| | | |/ / | | |/| |
| | * | | First keyboard layoutMitch Lloyd2016-03-101-0/+49
| | | |/ | | |/|
| | * | Merge remote-tracking branch 'qmk/master' into windocsyoyoerx2016-03-101-27/+24
| | |\ \
| | * | | Cygwin Based Users Guide v0.5 -further correctionsyoyoerx2016-03-091-347/+353
| | |/ /