summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Expand)AuthorAgeFilesLines
* minor tweaks at the keymap, new png for documentationStephan Bösebeck2016-04-012-6/+6
* fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2016-03-311-25/+25
* added CTL_Shift / Hash macroStephan Bösebeck2016-03-291-11/+24
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2824-1176/+4336
|\
| * 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
| |/
| * 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
* | | | minor changesStephan Bösebeck2016-03-242-1113/+1111
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2491-41409/+33727
|\| | |
| * | | 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
| |\ \ \ \
| | * \ \ \ Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2113-2577/+4004
| | |\ \ \ \
| | * | | | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1133-41292/+32894
| | * | | | | Addressed void* return warning in all keymapsyoyoerx2016-03-1044-149/+128
| * | | | | | Adding Retro_Refit KeyboardIBNobody2016-03-166-0/+400
| | |_|/ / / | |/| | | |
* | | | | | 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-209-2961/+3078
|\| | | |
| * | | | 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
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 12:51:11 +0000