qmk_firmware - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author	Files	Lines
2016-07-31	Merge branch 'master' of github.com:jackhumbert/qmk_firmware	Nathan Sharfi	178	-0/+21862
	# Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
2016-07-30	Update some obsolete references	Gergely Nagy	1	-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-29	Cleanup the townk_osx config.h and make files	Fred Sundvik	2	-52/+2

2016-07-29	Rename supercoder config_user to config.h	Fred Sundvik	1	-1/+1
	Also fixup the include path of parent config
2016-07-29	Change _delay_ms to wait_ms in algernon keymap	Fred Sundvik	1	-1216/+1217

2016-07-29	All Ez keymaps compiles	Fred Sundvik	57	-58/+58

2016-07-29	Initial structure for Ergodox as subprojects	Fred Sundvik	178	-0/+21911
	Only the EZ default keymaps compiles at the moment though.