]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5f90eb e9356dc)
Merge branch 'master' into flicker-fix
authorPeter Eichinger <peter.eichinger@gmail.com>
Mon, 25 Jan 2016 16:46:50 +0000 (17:46 +0100)
committerPeter Eichinger <peter.eichinger@gmail.com>
Mon, 25 Jan 2016 16:46:50 +0000 (17:46 +0100)

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