aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/keymaps
AgeCommit message (Collapse)Author
2016-08-02Merge pull request #592 from sethbc/ez-sethbcGravatar Erez Zukerman
Ez sethbc
2016-08-02Merge pull request #593 from J3RN/masterGravatar Erez Zukerman
Updated the J3RN ErgoDox keymap
2016-08-02Merge pull request #600 from adiabatic/masterGravatar Erez Zukerman
zweihander-osx: add left-hand-thumb tab key
2016-07-31Thumb ⌫ into ⇥, numpad & into :, yank home/endGravatar Nathan Sharfi
Also: add (back?) in the light-shine disabler
2016-07-31Merge branch 'master' of github.com:jackhumbert/qmk_firmwareGravatar Nathan Sharfi
# 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.hGravatar Fred Sundvik
So that only the files that really needs a version are recompiled.
2016-07-30Updated readme with recent changesGravatar Jonathan Arnett
2016-07-30Updated my keymapGravatar Jack Humbert
2016-07-30rebaseGravatar Seth Chandler
2016-07-30Update some obsolete referencesGravatar Gergely Nagy
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 filesGravatar Fred Sundvik
2016-07-29Rename supercoder config_user to config.hGravatar Fred Sundvik
Also fixup the include path of parent config
2016-07-29Change _delay_ms to wait_ms in algernon keymapGravatar Fred Sundvik
2016-07-29All Ez keymaps compilesGravatar Fred Sundvik
2016-07-29Initial structure for Ergodox as subprojectsGravatar Fred Sundvik
Only the EZ default keymaps compiles at the moment though.