]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4225f03 10a6b2c)
Merge remote-tracking branch 'upstream/master'
authorJack Humbert <jack.humb@gmail.com>
Thu, 15 Jan 2015 03:48:54 +0000 (22:48 -0500)
committerJack Humbert <jack.humb@gmail.com>
Thu, 15 Jan 2015 03:48:54 +0000 (22:48 -0500)

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