]> git.donarmstrong.com Git - tmk_firmware.git/commitdiff
projects / tmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea524d7 a59dea5)
Merge branch 'scottjad-master' into usb_usb_fix
authortmk <nobody@nowhere>
Mon, 22 Sep 2014 01:52:27 +0000 (10:52 +0900)
committertmk <nobody@nowhere>
Mon, 22 Sep 2014 01:52:27 +0000 (10:52 +0900)

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