]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'smarkefile' of https://github.com/jackhumbert/tmk_keyboard into smarkefile
authorJack Humbert <jack.humb@gmail.com>
Sat, 16 Jan 2016 06:09:21 +0000 (01:09 -0500)
committerJack Humbert <jack.humb@gmail.com>
Sat, 16 Jan 2016 06:09:21 +0000 (01:09 -0500)

Trivial merge