chiark / gitweb /
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Thu, 7 Mar 2013 15:59:06 +0000 (16:59 +0100)
committerdaid303 <daid303@gmail.com>
Thu, 7 Mar 2013 15:59:06 +0000 (16:59 +0100)
commitfbf4f9267dba413208b7ac7369facc72a2f7bc6e
tree6b0755e1ced8671497b2ead1f2a7bc628684b1d2
parent657ffee87751d18b86450f26826da90f67b11b0a
parent1e789a4fa47c1d12cfc71301171abd109e021e08
Merge branch 'master' into SteamEngine
Cura/gui/mainWindow.py
Cura/gui/simpleMode.py