summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/keymaps
Commit message (Expand)AuthorAge
* fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2016-03-31
* added CTL_Shift / Hash macroStephan Bösebeck2016-03-29
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-28
|\
| * Corrected duplicate image issueMatthew Carroll2016-03-28
| * Added msc keymap for ergodox_ezMatthew Carroll2016-03-27
| * Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-27
| |\
| | * Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-03-26
| | |\
| | * | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-26
| | * | The Ordinary Layout is familiar to users of common keyboardsNicholas Keene2016-03-24
| * | | Merge pull request #196 from naps62/naps62Erez Zukerman2016-03-27
| |\ \ \ | | |_|/ | |/| |
| | * | Adds naps62's layoutMiguel Palhas2016-03-15
| * | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-25
| |\ \ \ | | |_|/ | |/| |
| | * | Add important note about brightness on OS XRoman Zolotarev2016-03-22
* | | | minor changesStephan Bösebeck2016-03-24
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-24
|\| | |
| * | | Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-21
| |\ \ \
| * | | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-11
| * | | | Addressed void* return warning in all keymapsyoyoerx2016-03-10
| | |_|/ | |/| |
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-22
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #205 from romanzolotarev/masterErez Zukerman2016-03-21
| |\ \ \ | | | |/ | | |/|
| | * | Update readmeRoman Zolotarev2016-03-19
| | * | Update layoutRoman Zolotarev2016-03-19
| | * | Swap volup and voldownRoman Zolotarev2016-03-18
| | * | Add Roman's LayoutRoman Zolotarev2016-03-18
| | |/
* | | fix number pad, add ,Stephan Bösebeck2016-03-20
* | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ...Stephan Bösebeck2016-03-20
* | | tweaking it a bit further, fixing thingsStephan Bösebeck2016-03-20
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-20
|\| |
| * | Merge pull request #203 from XenoBits/masterErez Zukerman2016-03-20
| |\ \
| | * | Fixed png imageMaxime Millet2016-03-20
| | * | CSharp dev layout V2Maxime Millet2016-03-20
| * | | Add waits to prevent KVM from hangingMaciej Piechotka2016-03-17
| * | | Put frequently used keys in shell (-=) under thumbMaciej Piechotka2016-03-17
| * | | Add missing breaks in mpiechotka ergodox_ez keyboardMaciej Piechotka2016-03-17
| | |/ | |/|
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-08
|\| |
| * | Adds a readme with a link to the blog postErez Zukerman2016-03-08
| * | The Ordinary Layout, designed to be similar to traditional keyboards, by Nich...Nicholas Keene2016-03-06
* | | forgot F6Stephan Bösebeck2016-03-02
* | | updated version, changed F-Key-Layout, minor change in code layerStephan Bösebeck2016-03-02
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-02
|\| |
| * | Merge pull request #157 from DidierLoiseau/typematrixJack Humbert2016-02-21
| |\ \
| | * | Updated tm2030 keymap.hexDidier Loiseau2016-02-21
| | * | Fixed compilation warnings due to missing return statementsDidier Loiseau2016-02-21
| | * | FN macro: use layer_invert() instead of modifying layer_state directlyDidier Loiseau2016-02-07
| | * | Fixed inconsistency between comment and actual numeric layerDidier Loiseau2016-02-07
| | * | Fixed link to Magic doc in Dvorak sectionDidierLoiseau2016-02-07
* | | | testing moving the 6 to the left, having one key more on the right used for h...Stephan Bösebeck2016-02-15
|/ / /
* | | Merge pull request #141 from XenoBits/masterErez Zukerman2016-02-12
|\ \ \ | | |/ | |/|
| * | Another readme.md improvementMaxime Millet2016-02-12
| * | Improved readmeMaxime Millet2016-02-12