chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 424877f)
Merge branch 'master' of github.com:daid/Cura
authorDaid <daid303@gmail.com>
Fri, 4 May 2012 22:10:37 +0000 (00:10 +0200)
committerDaid <daid303@gmail.com>
Fri, 4 May 2012 22:10:37 +0000 (00:10 +0200)
Conflicts:
Cura/gui/sliceProgessPanel.py


No differences found
Unnamed repository; edit this file 'description' to name the repository.