2 Commits (7e1be3ae7c5b1839ce03fcedcc180e19836d3200)

Author	SHA1	Message	Date
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	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