]> git.donarmstrong.com Git - qmk_firmware.git/commit
Merge branch 'master' of github.com:dragon788/qmk_firmware_ez
authordragon788 <github@deik.me>
Sun, 27 Dec 2015 19:15:03 +0000 (13:15 -0600)
committerdragon788 <github@deik.me>
Sun, 27 Dec 2015 19:15:03 +0000 (13:15 -0600)
commit01dc8b32448c811aa41ba67cd818a369bcb2dd96
tree5e2af11e4906c99ab893544ddbd0e6e5d1452f95
parent981434333689299d8fc6f73979fd3864655430f5
parentb61ea5dfaf541dcef695b0c3fc4e4cbfd742a98f
Merge branch 'master' of github.com:dragon788/qmk_firmware_ez

Conflicts:
keyboard/ergodox_ez/keymaps/keymap_default.c
keyboard/ergodox_ez/keymaps/keymap_default.c