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