]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
projects / max / tmk_keyboard.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d440fc 99732d5)
Merge remote-tracking branch 'tmk/master'
authorMark Sikora <marknsikora@gmail.com>
Sun, 7 Feb 2016 21:30:46 +0000 (16:30 -0500)
committerMark Sikora <marknsikora@gmail.com>
Sun, 7 Feb 2016 21:30:46 +0000 (16:30 -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.