HCoop / clinton / Smoothieware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4e7043 315e23d)
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
authorJim Morris <wolfmanjm@gmail.com>
Sat, 12 Jul 2014 03:38:54 +0000 (20:38 -0700)
committerJim Morris <wolfmanjm@gmail.com>
Sat, 12 Jul 2014 03:38:54 +0000 (20:38 -0700)

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