]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bbd3c1 ad20615)
Merge remote-tracking branch 'upstream/master' into kitten_paw
authorRené Werner <mail@renewerner.net>
Thu, 25 Aug 2016 10:27:29 +0000 (12:27 +0200)
committerRené Werner <mail@renewerner.net>
Thu, 25 Aug 2016 10:27:29 +0000 (12:27 +0200)

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