Age | Commit message (Collapse) | Author | |
---|---|---|---|
2016-07-31 | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Nathan Sharfi | |
# Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex | |||
2016-07-29 | Initial structure for Ergodox as subprojects | Fred Sundvik | |
Only the EZ default keymaps compiles at the moment though. |