summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | |/
* | | 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 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
| | |/ | |/|
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-084-0/+1317
|\| |
| * | 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
* | | 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
|\| |
| * | 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
| | * | FN macro: use layer_invert() instead of modifying layer_state directlyDidier Loiseau2016-02-071-20/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 23:30:14 +0000