Commit Graph

5 Commits

Author SHA1 Message Date
Thomas Karl Pietrowski
1b1195d12e Merge pull request #11 from thopiekar/2.4
materials: Set conflict on older cura package
2016-12-20 09:13:42 +01:00
Thomas Karl Pietrowski
92635955d9 materials: Set conflict on older cura package
The old package already includes these files. Thus unpacking cura-resources-materials will fail.
2016-12-19 21:59:06 +01:00
Thomas Karl Pietrowski
2f4bc0e6aa packaging: Bumping version to 2.4.99-master 2016-12-15 18:26:15 +01:00
Thomas Karl Pietrowski
fa1a053c17 packaging: Bumping version to 2.4.0 2016-12-15 15:00:22 +01:00
Thomas Karl Pietrowski
e98705b271 packaging: killing structure of using separate stable and master directories 2016-12-15 14:56:09 +01:00