]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef8f618 f44ead1)
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
authorIBNobody <protospherex@gmail.com>
Fri, 28 Oct 2016 14:28:47 +0000 (09:28 -0500)
committerIBNobody <protospherex@gmail.com>
Fri, 28 Oct 2016 14:28:47 +0000 (09:28 -0500)
1  2 
readme.md patch | diff1 | diff2 | blob | history

diff --cc readme.md
Simple merge
Unnamed repository; edit this file 'description' to name the repository.