summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/keymaps
AgeCommit message (Collapse)AuthorFilesLines
2016-08-02Merge pull request #600 from adiabatic/masterErez Zukerman4-14/+1167
zweihander-osx: add left-hand-thumb tab key
2016-07-31Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi3-13/+1166
Also: add (back?) in the light-shine disabler
2016-07-31Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi178-0/+21862
# Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
2016-07-31Generate version information to version.hFred Sundvik3-0/+3
So that only the files that really needs a version are recompiled.
2016-07-30Update some obsolete referencesGergely Nagy1-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>
2016-07-29Cleanup the townk_osx config.h and make filesFred Sundvik2-52/+2
2016-07-29Rename supercoder config_user to config.hFred Sundvik1-1/+1
Also fixup the include path of parent config
2016-07-29Change _delay_ms to wait_ms in algernon keymapFred Sundvik1-1216/+1217
2016-07-29All Ez keymaps compilesFred Sundvik57-58/+58
2016-07-29Initial structure for Ergodox as subprojectsFred Sundvik178-0/+21911
Only the EZ default keymaps compiles at the moment though.