chiark / gitweb /
Merge branch 'master' of github.com:daid/Cura
authorDaid <daid303@gmail.com>
Thu, 29 Mar 2012 19:11:43 +0000 (21:11 +0200)
committerDaid <daid303@gmail.com>
Thu, 29 Mar 2012 19:11:43 +0000 (21:11 +0200)
commitc44c6562357c699342e69c31a116f5948f19bdb2
tree8fc6e71229e2f24da3fd71cbca9ab2fe57e9e1b1
parent3ec6fa40d6352850096786c02ea07417327f3fb0
parentab6430c843a9d4a44c40df7c6ffd22e2fe6430e3
Merge branch 'master' of github.com:daid/Cura
Cura/gui/mainWindow.py