summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* 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-2568-41382/+32976
|\| | |
| * | | 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
| |\ \ \
| * | | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1133-41292/+32894
| * | | | Addressed void* return warning in all keymapsyoyoerx2016-03-1033-98/+85
| | |_|/ | |/| |
* | | | 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
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | |/
| * | 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
| | |/ | |/|
* | | 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
|/ /
* | Adds a readme with a link to the blog postErez Zukerman2016-03-082-0/+5
* | The Ordinary Layout, designed to be similar to traditional keyboards, by Nich...Nicholas Keene2016-03-063-0/+1312
* | Merge pull request #157 from DidierLoiseau/typematrixJack Humbert2016-02-213-1505/+1483
|\ \
| * | Updated tm2030 keymap.hexDidier Loiseau2016-02-211-1482/+1476
| * | Fixed compilation warnings due to missing return statementsDidier Loiseau2016-02-211-1/+2