chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c74a1ae 6f04f86)
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Thu, 14 Mar 2013 14:17:54 +0000 (15:17 +0100)
committerdaid303 <daid303@gmail.com>
Thu, 14 Mar 2013 14:17:54 +0000 (15:17 +0100)
1  2 
Cura/slice/__main__.py patch | diff1 | diff2 | blob | history

diff --cc Cura/slice/__main__.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.