]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2de3715 9487e92)
Merge branch 'master' into j3rn-keymap
authorJonathan Arnett <jonarnett90@gmail.com>
Sat, 16 Jan 2016 14:54:46 +0000 (09:54 -0500)
committerJonathan Arnett <jonarnett90@gmail.com>
Sat, 16 Jan 2016 14:54:46 +0000 (09:54 -0500)

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