summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/keymaps
Commit message (Collapse)AuthorAgeFilesLines
* Created keymap-specific config.hJoshua T2016-08-091-0/+63
|
* Merge remote-tracking branch 'upstream/master'Joshua T2016-08-0712-36/+1315
|\
| * Merge pull request #592 from sethbc/ez-sethbcErez Zukerman2016-08-023-0/+119
| |\ | | | | | | Ez sethbc
| | * rebaseSeth Chandler2016-07-303-0/+119
| | |
| * | Merge pull request #593 from J3RN/masterErez Zukerman2016-08-022-22/+26
| |\ \ | | | | | | | | Updated the J3RN ErgoDox keymap
| | * | Updated readme with recent changesJonathan Arnett2016-07-301-3/+6
| | | |
| | * | Updated my keymapJack Humbert2016-07-302-20/+21
| | |\|
| * | | Merge pull request #600 from adiabatic/masterErez Zukerman2016-08-024-14/+1167
| |\ \ \ | | | | | | | | | | zweihander-osx: add left-hand-thumb tab key
| | * | | Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi2016-07-313-13/+1166
| | | | | | | | | | | | | | | | | | | | Also: add (back?) in the light-shine disabler
| | * | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-07-311-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | # Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
| * / | Generate version information to version.hFred Sundvik2016-07-313-0/+3
| |/ / | | | | | | | | | So that only the files that really needs a version are recompiled.
* / / Moved my Ergodox keymap to match upstream changesJoshua T2016-07-302-0/+379
|/ /
* / Update some obsolete referencesGergely Nagy2016-07-301-1/+1
|/ | | | | | | | | | | Some links were still pointing to `/keyboards/ergodox_ez`, while the directory is `/keyboards/erdogox` now. Not all references have been updated, and some of the text here and there may need updating to mention the ErgoDox Infinity too, but that's out of the scope for this quick fix. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* Cleanup the townk_osx config.h and make filesFred Sundvik2016-07-292-52/+2
|
* Rename supercoder config_user to config.hFred Sundvik2016-07-291-1/+1
| | | | Also fixup the include path of parent config
* Change _delay_ms to wait_ms in algernon keymapFred Sundvik2016-07-291-1216/+1217
|
* All Ez keymaps compilesFred Sundvik2016-07-2957-58/+58
|
* Initial structure for Ergodox as subprojectsFred Sundvik2016-07-29178-0/+21911
Only the EZ default keymaps compiles at the moment though.