summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #215 from nrrkeene/masterErez Zukerman2016-04-063-6/+60
|\
| * The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-273-6/+60
* | Updated hexAlex Johnstone2016-04-051-893/+895
* | :pound: typoAlex Johnstone2016-04-051-0/+4
* | :pound: typoAlex Johnstone2016-04-051-1/+1
* | Merge pull request #5 from jackhumbert/masterAlex Johnstone2016-04-0596-3174/+12270
|\ \
| * | updates to noiseJack Humbert2016-04-055-5/+162
| * | Merge pull request #235 from mbarkhau/masterErez Zukerman2016-04-042-92/+123
| |\ \
| | * | add indent to generated keymapManuel Barkhau2016-04-032-92/+123
| * | | music mode fileJack Humbert2016-04-036-16/+1725
| * | | Merge pull request #213 from mbarkhau/masterErez Zukerman2016-04-034-0/+2890
| |\| |
| | * | use action function for unicodeManuel Barkhau2016-04-024-2540/+1651
| | * | Update compile_keymap.pymbarkhau2016-03-291-13/+11
| | * | add hex fileManuel Barkhau2016-03-281-0/+1624
| | * | Merge remote-tracking branch 'origin/master'Manuel Barkhau2016-03-2823-1175/+4331
| | |\ \
| | * | | Refactor compiler codeManuel Barkhau2016-03-283-1661/+1900
| | * | | Add manuneo layoutManuel Barkhau2016-03-273-0/+1918
| * | | | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-04-0278-1924/+4833
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-0176-1894/+4803
| | |\ \ \ \
| | | * | | | Create tak3over.ctak3over2016-04-011-0/+136
| | | * | | | adding files is always smartJack Humbert2016-04-017-0/+327
| | | * | | | Also add compiled hex fileDavid Mohr2016-03-301-0/+1127
| | | * | | | Squisher's international dvorak variant for ergodox ezDavid Mohr2016-03-305-0/+214
| | | * | | | 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
| | | | | |/ / | | | | |/| |
| | | * | | | .hex filesJack Humbert2016-03-303-2/+2893
| | | * | | | preonic updateJack Humbert2016-03-3019-1844/+64
| | * | | | | 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
| * | | | | | new keymapStephan Bösebeck2016-04-021-1/+9
| |/ / / / /
| * | | | | 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
| | |/ / /
| * | | | minor changesStephan Bösebeck2016-03-242-1113/+1111
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2491-41409/+33727
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-224-0/+1309
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \