]> 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: f852668 60b88f1)
Merge remote-tracking branch 'tmk/master'
authorMark Sikora <marknsikora@gmail.com>
Sat, 18 Jun 2016 22:22:19 +0000 (18:22 -0400)
committerMark Sikora <marknsikora@gmail.com>
Sat, 18 Jun 2016 22:22:19 +0000 (18:22 -0400)
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.