chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8732001 b785dcc)
Merge branch 'master' of github.com:daid/Cura
authorDaid <daid303@gmail.com>
Tue, 25 Sep 2012 10:09:09 +0000 (12:09 +0200)
committerDaid <daid303@gmail.com>
Tue, 25 Sep 2012 10:09:09 +0000 (12:09 +0200)
Conflicts:
Cura/util/machineCom.py


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