chiark / gitweb /
Merge branch 'master' of github.com:daid/Cura
authordaid303 <daid303@gmail.com>
Tue, 22 Jan 2013 14:26:01 +0000 (15:26 +0100)
committerdaid303 <daid303@gmail.com>
Tue, 22 Jan 2013 14:26:01 +0000 (15:26 +0100)
commit2b61696aa4d0b61221e00bd5f9497291ed7ead2a
tree6544b174b5fd425cfe1369ffabfcecdf39a95062
parent3d2455aa317448c3beb1115ca49b8b8e7c022236
parent5bd78cfbf9e5fbb9d791d99de3daadcb1bc2e1f5
Merge branch 'master' of github.com:daid/Cura
Cura/gui/mainWindow.py