]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
Merge branch 'master' into chibios
authorflabbergast <s3+flabbergast@sdfeu.org>
Fri, 30 Oct 2015 07:21:22 +0000 (07:21 +0000)
committerflabbergast <s3+flabbergast@sdfeu.org>
Fri, 30 Oct 2015 07:21:22 +0000 (07:21 +0000)

Trivial merge