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)
commit27f2ba99ef5f044e02c4c682adf9b2512f4fd63a
treeec0853127114f7ba6b4de8d9eb6d4114e6599307
parent32065f138943b3112f3a813d2b2cf36a48f82804
parenteaec05375f236b314aeaada202edfdb8998b2dd8
Merge branch 'master' into SteamEngine

Conflicts:
Cura/util/profile.py
Cura/gui/simpleMode.py
Cura/gui/sliceProgressPanel.py