]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c5c3e6 8144ce8)
Merge remote-tracking branch 'upstream/master'
authorXyverz <xyverz@gmail.com>
Thu, 18 Aug 2016 06:53:56 +0000 (23:53 -0700)
committerXyverz <xyverz@gmail.com>
Thu, 18 Aug 2016 06:53:56 +0000 (23:53 -0700)
this merge is necessary,


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