chiark / gitweb /
Merge branch 'master' of github.com:daid/Cura
authorDaid <daid303@gmail.com>
Fri, 4 May 2012 22:10:37 +0000 (00:10 +0200)
committerDaid <daid303@gmail.com>
Fri, 4 May 2012 22:10:37 +0000 (00:10 +0200)
commit1b6cb8913cafeab44fcde0e59b88370dd0eec982
tree21ba1170596b85d9108df3fa16f0679de1898ca6
parentd51df65c83f8b06868a9f634a4478985dc65368d
parent424877fe0f729d2fc7dcbcada10946fa5fdde2cf
Merge branch 'master' of github.com:daid/Cura

Conflicts:
Cura/gui/sliceProgessPanel.py