]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13fa63b 712f3de)
Merge remote-tracking branch 'upstream/master'
authorBrendan Johan Lee <deadcyclo@vanntett.net>
Fri, 27 Jan 2017 14:24:08 +0000 (15:24 +0100)
committerBrendan Johan Lee <deadcyclo@vanntett.net>
Fri, 27 Jan 2017 14:24:08 +0000 (15:24 +0100)

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