Jaime van Kessel d69ca6fa41 Merge branch 'master' of https://github.com/Ultimaker/Cura		2015-08-17 15:18:56 +02:00
..
i18n	Update Cura translation file with the correct version	2015-06-30 17:29:40 +02:00
images	Add profile for machine 3DMaker Starter	2015-08-10 21:54:38 +07:00
meshes	Merge pull request #247 from KJHamblin/master	2015-08-13 09:16:07 +02:00
qml	Changed selectupgradeparts	2015-08-17 15:18:46 +02:00
settings	Replace category stuff with the new setting overrides	2015-08-17 15:07:19 +02:00
themes/cura	Adds the styling and wizardPages (more directly) to the generic wizard	2015-08-13 10:48:33 +02:00