Commit Graph

11 Commits

Author SHA1 Message Date
Thomas Karl Pietrowski
826c353e00 Bumping to version 2.6.99-master 2017-06-29 08:59:10 +02:00
Thomas Karl Pietrowski
ff0453a1bf Merge pull request #21 from thopiekar/2.5
Merging 2.5 into master
2017-04-30 10:25:28 +02:00
Thomas Karl Pietrowski
9a18b32f77 fdm_materials: Adding more provides for different vendors
Signed-off-by: Thomas Karl Pietrowski <thopiekar@gmail.com> (github: thopiekar)
2017-04-29 20:48:15 +02:00
Thomas Karl Pietrowski
ccae396f4a Bumping to version 2.5.0 2017-04-28 22:16:19 +02:00
Thomas Karl Pietrowski
a01cf37285 Bumping to 2.5.99-master 2017-04-28 21:47:26 +02:00
Thomas Karl Pietrowski
fe0b305651 Bumping to version 2.5.0 2017-04-28 21:44:50 +02:00
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