chiark / gitweb /
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Fri, 22 Mar 2013 12:06:47 +0000 (13:06 +0100)
committerdaid303 <daid303@gmail.com>
Fri, 22 Mar 2013 12:06:47 +0000 (13:06 +0100)
commit7bf2035281529087c71373034518aa1ae1946c5e
treec2674aeee39b948ab13a76199ae320ee2b64def7
parent1205ac94dd57ba85b3d16b93383479ab2cf4241f
parentfaf8d96b38c658de8e6aa3ccd5c2f5d7e0c811ee
Merge branch 'master' into SteamEngine
Cura/gui/mainWindow.py