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
..
keymap.c	Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)	2016-06-21 22:39:54 -04:00
makefile.mk	zweihander: Add :, disable sleep LED waves	2016-05-30 15:44:59 -07:00
zweihander-osx.hex	Makefile redo & other features (#395)	2016-06-11 13:31:31 -04:00