chiark / gitweb /
Merge branch 'master' of github.com:daid/Cura
authorDaid <daid303@gmail.com>
Wed, 28 Mar 2012 18:36:52 +0000 (20:36 +0200)
committerDaid <daid303@gmail.com>
Wed, 28 Mar 2012 18:36:52 +0000 (20:36 +0200)
commit3ec6fa40d6352850096786c02ea07417327f3fb0
tree5437b5369e579e1c93e56729467161811dd7109b
parent2d7929704785bd68f9320ce3bb606b2cff650409
parent0834aec2d2161c54805e89e5e085ba7941d5e5ac
Merge branch 'master' of github.com:daid/Cura
Cura/gui/mainWindow.py
Cura/gui/printWindow.py