summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez/keymaps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-067-6/+1618
|\
| * 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-0519-1252/+6867
| |\ \
| * | | 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
| |\ \ \ | | | |/ | | |/|
| * | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-272-1140/+1198
| * | | Merge pull request #3 from jackhumbert/masterAlex Johnstone2016-03-2563-41349/+32928
| |\ \ \
| * | | | New :pound: methodAlex Johnstone2016-03-231-1/+1
| * | | | New :pound: methodAlex Johnstone2016-03-231-1/+2
| * | | | New :pound: methodAlex Johnstone2016-03-231-2/+2
| * | | | New :pound: methodAlex Johnstone2016-03-231-0/+5
| * | | | New :pound: methodAlex Johnstone2016-03-232-1135/+1131
| * | | | Wrong dateAlex Johnstone2016-03-231-1/+1
| * | | | 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
| | | |/ / / / | | |/| | | |