]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
Merge branch 'mek-apelsin-lola'
authortmk <hasu@tmk-kbd.com>
Tue, 28 Apr 2015 02:45:25 +0000 (11:45 +0900)
committertmk <hasu@tmk-kbd.com>
Tue, 28 Apr 2015 02:45:25 +0000 (11:45 +0900)

Trivial merge