]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 926ce22 24cb218)
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
authorErez Zukerman <ezuk@madmimi.com>
Tue, 10 Nov 2015 02:40:52 +0000 (04:40 +0200)
committerErez Zukerman <ezuk@madmimi.com>
Tue, 10 Nov 2015 02:40:52 +0000 (04:40 +0200)
Conflicts:
keyboard/ergodox_ez/keymaps/keymap_default.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.