]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorChris Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Mon, 10 Oct 2016 21:19:47 +0000 (17:19 -0400)
committerChris Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Mon, 10 Oct 2016 21:19:47 +0000 (17:19 -0400)

Trivial merge