]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7
authorJack Humbert <jack.humb@gmail.com>
Tue, 29 Nov 2016 05:10:06 +0000 (00:10 -0500)
committerJack Humbert <jack.humb@gmail.com>
Tue, 29 Nov 2016 05:10:06 +0000 (00:10 -0500)
1  2 
keyboards/ergodox/ez/config.h

Simple merge