]> git.donarmstrong.com Git - qmk_firmware.git/commit
projects / qmk_firmware.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b61ea5d 9814343)
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
authordragon788 <dragon788@users.noreply.github.com>
Mon, 28 Dec 2015 20:44:49 +0000 (14:44 -0600)
committerdragon788 <dragon788@users.noreply.github.com>
Mon, 28 Dec 2015 20:44:49 +0000 (14:44 -0600)
commitd1f8d0104bd35bb7e812490f474fab3a9aba8fcb
tree5e2af11e4906c99ab893544ddbd0e6e5d1452f95tree | snapshot
parentb61ea5dfaf541dcef695b0c3fc4e4cbfd742a98fcommit | diff
parent981434333689299d8fc6f73979fd3864655430f5commit | diff
Merge branch 'master' of github.com:jackhumbert/qmk_firmware

Conflicts:
keyboard/ergodox_ez/keymaps/keymap_default.c
keyboard/ergodox_ez/keymaps/keymap_default.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.