chiark / gitweb /
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 08:53:37 +0000 (09:53 +0100)
committerdaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 08:53:37 +0000 (09:53 +0100)
Conflicts:
Cura/util/profile.py

1  2 
Cura/gui/simpleMode.py
Cura/gui/sliceProgressPanel.py

Simple merge
Simple merge