Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
authorJack Humbert <jack.humb@gmail.com>
Tue, 22 Nov 2016 01:17:45 +0000 (20:17 -0500)
committerJack Humbert <jack.humb@gmail.com>
Tue, 22 Nov 2016 01:17:45 +0000 (20:17 -0500)
commit450a8fb5b61de8166fe21eb4f57e1c00514afe32
treec7d363a244115eb3736401cc6670f1967ddf9a5d
parent06a2677b7eedbf58532fa1a673ba1277e756174d
parentaf119baf710c0b19cfe3351e3f3e89ddeeaacdf6
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
quantum/quantum.c