chiark / gitweb /
Merge fix.
authordaid303 <daid303@gmail.com>
Fri, 15 Mar 2013 11:46:03 +0000 (12:46 +0100)
committerdaid303 <daid303@gmail.com>
Fri, 15 Mar 2013 11:46:03 +0000 (12:46 +0100)
commit16fa6db65e12a31b9be86cc14b657d02e2bb857a
tree55ebb82ca8ae3982353251b04c83ab5d49d88cab
parent7a5534461401c3a466abfc194eb9f0d73cc33ddf
parent2f53afc39a3457e6156616665d7dc9bbaba6da09
Merge fix.
Cura/gui/mainWindow.py
Cura/slice/__main__.py