summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez/keymaps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2462-41320/+32855
|\
| * Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2111-2340/+3603
| |\
| * | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1131-41292/+32866
| * | Addressed void* return warning in all keymapsyoyoerx2016-03-1030-65/+65
* | | 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
| | * | Fixed inconsistency between comment and actual numeric layerDidier Loiseau2016-02-071-1/+1
| | * | Fixed link to Magic doc in Dvorak sectionDidierLoiseau2016-02-071-1/+1
* | | | testing moving the 6 to the left, having one key more on the right used for h...Stephan Bösebeck2016-02-152-1519/+1561
|/ / /
* | | Merge pull request #141 from XenoBits/masterErez Zukerman2016-02-125-0/+1489
|\ \ \ | | |/ | |/|
| * | Another readme.md improvementMaxime Millet2016-02-121-9/+9
| * | Improved readmeMaxime Millet2016-02-121-10/+10
| * | Added C# developer keymapMaxime Millet2016-02-125-0/+1489
* | | Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-...Erez Zukerman2016-02-114-0/+1429
|\ \ \
| * | | Norwegian Colemak Ergodox and Norwegian key definitionsjoar2016-02-114-0/+1429
* | | | More tweaks to experimental layoutErez Zukerman2016-02-113-18/+19
|/ / /
* | | Merge pull request #138 from Willyfrog/masterErez Zukerman2016-02-104-0/+1666
|\ \ \ | |/ / |/| |
| * | add imageGuillermo Vayá2016-02-101-0/+0
| * | added .hex fileGuillermo Vayá2016-02-101-0/+1472
| * | new emacs + osx + deadkeys layoutGuillermo Vayá2016-01-312-0/+194
* | | Add mpiechotka ergodox ez keymapMaciej Piechotka2016-02-093-0/+1770
* | | Merge pull request #130 from jacobono/jacobonoErez Zukerman2016-02-086-0/+1449
|\ \ \
| * | | add hex fileDaniel Mijares2016-02-061-0/+1142
| * | | my personal ergodox keymap layoutDaniel Mijares2016-02-065-0/+307
* | | | Updates documentation, adds Cmd/Win dual-function keyErez Zukerman2016-02-085-1443/+1098
|/ / /
* | | Fixes CM_SCLN and updates docs for ColemakErez Zukerman2016-02-052-5/+6