summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Removed whitespaceAlex Johnstone2016-03-221-55/+54
| * | | | | Revised to version 0.1.0Alex Johnstone2016-03-224-979/+1010
| * | | | | Merge pull request #2 from jackhumbert/masterAlex Johnstone2016-03-2211-2724/+3986
| |\ \ \ \ \
| * | | | | | Meh -> HyperAlex Johnstone2016-03-221-1/+1
| * | | | | | Update readme.mdAlex Johnstone2016-03-221-1/+1
| * | | | | | Added photoAlex Johnstone2016-03-221-1/+1
| * | | | | | Added real life layoutAlex Johnstone2016-03-221-0/+0
| * | | | | | Added ReadmeAlex Johnstone2016-03-211-0/+111
| * | | | | | added .hexAlex Johnstone2016-03-211-0/+1124
| * | | | | | typosAlex Johnstone2016-03-211-2/+2
| * | | | | | Update keymap.cAlex Johnstone2016-03-211-6/+6
| * | | | | | More updatesAlex Johnstone2016-03-211-14/+15
| * | | | | | work in progressAlex Johnstone2016-03-201-28/+28
| * | | | | | Started my keymapAlex Johnstone2016-03-111-0/+184
* | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-042-92/+123
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #235 from mbarkhau/masterErez Zukerman2016-04-042-92/+123
| |\ \ \ \ \ \
| | * | | | | | add indent to generated keymapManuel Barkhau2016-04-032-92/+123
* | | | | | | | minor updates - new PNGStephan Bösebeck2016-04-032-16/+20
|/ / / / / / /
* | | | | | | 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
| | |_|_|/ / | |/| | | |
| * | | | | 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-2467-41353/+32903
|\| | | |
| * | | | Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2111-2340/+3603
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1133-41292/+32894
| * | | | Addressed void* return warning in all keymapsyoyoerx2016-03-1033-98/+85
| | |_|/ | |/| |
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-224-0/+1309
|\ \ \ \ | | |/ / | |/| |