]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
Merge remote-tracking branch 'tmk/master' into cub_layout
authorOleg Kostyuk <cub.uanic@gmail.com>
Fri, 2 Jan 2015 21:55:55 +0000 (23:55 +0200)
committerOleg Kostyuk <cub.uanic@gmail.com>
Fri, 2 Jan 2015 21:55:55 +0000 (23:55 +0200)

Trivial merge