63 commits

Author	SHA1	Message	Date
Erez Zukerman	6eab4ecd7e	Merge pull request #600 from adiabatic/master ... zweihander-osx: add left-hand-thumb tab key	2016-08-02 08:01:56 -04:00
Nathan Sharfi	07a631bd5a	Thumb ⌫ into ⇥, numpad & into :, yank home/end ... Also: add (back?) in the light-shine disabler	2016-07-31 14:21:08 -07:00
Nathan Sharfi	d889648d53	Merge branch 'master' of github.com:jackhumbert/qmk_firmware ... # Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex	2016-07-31 14:02:25 -07:00
Fred Sundvik	97817a773e	Generate version information to version.h ... So that only the files that really needs a version are recompiled.	2016-07-31 13:42:05 +03:00
Jonathan Arnett	1876e100be	Updated readme with recent changes	2016-07-30 14:37:54 -04:00
Jack Humbert	17bd4ac062	Updated my keymap	2016-07-30 14:07:27 -04:00
Seth Chandler	a6ec5fa74a	rebase	2016-07-30 10:46:13 -04:00
Gergely Nagy	8a9bf1f165	Update some obsolete references ... 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-30 08:37:30 +02:00
Fred Sundvik	650298cec3	Cleanup the townk_osx config.h and make files	2016-07-29 21:09:34 +03:00
Fred Sundvik	fd7f20b029	Rename supercoder config_user to config.h ... Also fixup the include path of parent config	2016-07-29 21:09:33 +03:00
Fred Sundvik	1641743b9d	Change _delay_ms to wait_ms in algernon keymap	2016-07-29 21:09:21 +03:00
Fred Sundvik	b0376687f4	All Ez keymaps compiles	2016-07-29 20:48:19 +03:00
Fred Sundvik	9af995c59b	Initial structure for Ergodox as subprojects ... Only the EZ default keymaps compiles at the moment though.	2016-07-29 20:48:04 +03:00