]> git.donarmstrong.com Git - qmk_firmware.git/commit
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)
commitea44ac4a622329f719ff82497fb47c9d3f623364
tree4e11eab0d565deb75ecbbd1bd8393cc59ca54567
parent926ce2262f140f29c94d53984cc6eba8b62caab6
parent24cb218de0a0ca50c2d1f6c4caadb6677b84be3c
Merge branch 'master' of github.com:jackhumbert/qmk_firmware

Conflicts:
keyboard/ergodox_ez/keymaps/keymap_default.c