HCoop / clinton / Smoothieware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d27a61 43b718c)
Merge remote-tracking branch 'upstream/edge' into upstream-master
authorJim Morris <morris@wolfman.com>
Mon, 14 Dec 2015 21:54:01 +0000 (13:54 -0800)
committerJim Morris <morris@wolfman.com>
Mon, 14 Dec 2015 21:54:01 +0000 (13:54 -0800)
Conflicts:
FirmwareBin/firmware-disablemsd.bin
FirmwareBin/firmware.bin
FirmwareBin/firmware.bin.md5sum


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