chiark / gitweb /
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 16:06:43 +0000 (17:06 +0100)
committerdaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 16:06:43 +0000 (17:06 +0100)
commit0212a8d3418ac36c1dd6b1356f587a206f2c3ada
treedf7f9c25fafa62c3a3d37a30dc47d9e373e79baf
parent8571f9fdb1279c5ff09773e36247993c5b530b9c
parent36c29152e5eddd5fafae651bc35acddb0fc78f2f
Merge branch 'master' into SteamEngine

Conflicts:
Cura/gui/mainWindow.py
Cura/slice/__main__.py
Cura/util/profile.py
Cura/gui/mainWindow.py