summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez/keymaps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5 from jackhumbert/masterAlex Johnstone2016-04-0519-1252/+6867
|\
| * Merge pull request #235 from mbarkhau/masterErez Zukerman2016-04-042-92/+123
| |\
| | * add indent to generated keymapManuel Barkhau2016-04-032-92/+123
| * | 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-2819-1147/+4256
| | |\
| | * | 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-028-30/+1371
| |\ \ \
| | * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-016-0/+1341
| | |\ \ \
| | | * | | Also add compiled hex fileDavid Mohr2016-03-301-0/+1127
| | | * | | Squisher's international dvorak variant for ergodox ezDavid Mohr2016-03-305-0/+214
| | | | |/ | | | |/|
| | * | | 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-2820-1148/+4261
| |\| |
| | * | Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| | * | Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| * | | minor changesStephan Bösebeck2016-03-242-1113/+1111
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2462-41320/+32855
| |\ \ \
| * \ \ \ 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-207-2724/+2677
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-084-0/+1317
| |\ \ \ \ \ \
| * | | | | | | forgot F6Stephan Bösebeck2016-03-022-2/+2
| * | | | | | | updated version, changed F-Key-Layout, minor change in code layerStephan Bösebeck2016-03-022-1481/+1479
| * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-023-1505/+1483
| |\ \ \ \ \ \ \
| * | | | | | | | testing moving the 6 to the left, having one key more on the right used for h...Stephan Bösebeck2016-02-152-1519/+1561
* | | | | | | | | Updated hexAlex Johnstone2016-03-281-1139/+1138
* | | | | | | | | ££££Alex Johnstone2016-03-281-1/+1
* | | | | | | | | Forgot to change ent/spcAlex Johnstone2016-03-281-693/+697
* | | | | | | | | Didn'tAlex Johnstone2016-03-281-2/+2
* | | | | | | | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-271-6/+45
* | | | | | | | | Merge pull request #4 from jackhumbert/masterAlex Johnstone2016-03-2713-1147/+2922
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | 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
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-272-1140/+1198
* | | | | | | | Merge pull request #3 from jackhumbert/masterAlex Johnstone2016-03-2563-41349/+32928
|\| | | | | | |
| * | | | | | | 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
| * | | | | | | Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2111-2340/+3603
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |