Commit Graph

2 Commits (e5396ca9e5ccb714a757b6559c9f7e95bf372e3f)

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
8 years ago
Fred Sundvik 9af995c59b Initial structure for Ergodox as subprojects
Only the EZ default keymaps compiles at the moment though.
8 years ago