]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
projects / max / tmk_keyboard.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a75834e 33714e5)
Merge remote-tracking branch 'upstream/master' into chibios
authorflabbergast <s3+flabbergast@sdfeu.org>
Fri, 18 Dec 2015 20:54:41 +0000 (20:54 +0000)
committerflabbergast <s3+flabbergast@sdfeu.org>
Fri, 18 Dec 2015 20:54:41 +0000 (20:54 +0000)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.