chiark / gitweb /
Merge branch 'master' of github.com:daid/Cura
authordaid <daid303@gmail.com>
Thu, 26 Jul 2012 15:29:49 +0000 (17:29 +0200)
committerdaid <daid303@gmail.com>
Thu, 26 Jul 2012 15:29:49 +0000 (17:29 +0200)
commit9a4179e31ddcf9e3d2e91e041b02ccd0dc827d8c
tree246172ce1a6f6cc596c27d9e5b90568dd653846f
parentcfbe98b0f7124f69b02ab2a6d820adbad393ff86
parent5346d084964240d3cd7ba884487e4c56abbf1e84
Merge branch 'master' of github.com:daid/Cura