]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d891144 7a4ec3b)
Merge remote-tracking branch 'upstream/master' into infinity60
authorjpetermans <tibcmhhm@gmail.com>
Wed, 24 May 2017 18:51:20 +0000 (11:51 -0700)
committerjpetermans <tibcmhhm@gmail.com>
Wed, 24 May 2017 18:51:20 +0000 (11:51 -0700)

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