]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile
authorJack Humbert <jack.humb@gmail.com>
Sun, 24 Jan 2016 01:33:35 +0000 (20:33 -0500)
committerJack Humbert <jack.humb@gmail.com>
Sun, 24 Jan 2016 01:33:35 +0000 (20:33 -0500)

Trivial merge