]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'rn42_integrate'
authortmk <hasu@tmk-kbd.com>
Fri, 16 Jan 2015 02:51:34 +0000 (11:51 +0900)
committertmk <hasu@tmk-kbd.com>
Fri, 16 Jan 2015 02:51:34 +0000 (11:51 +0900)

Trivial merge