Arjen Hiemstra 9b88f06970 Merge branch '2.1'		2016-04-13 13:53:51 +02:00
..
i18n	../resources/i18n/nl/fdmprinter.json.po	2016-04-12 17:39:03 +02:00
images	Change splash-screen so it does not say "developer version", pending a release "real soon now"	2016-04-05 22:28:52 +02:00
machines	JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694)	2016-04-13 09:56:34 +02:00
meshes	Rename inventor_platform.stl to match the rest	2016-03-03 17:21:00 +01:00
profiles	removed old duplicate profiles introduced by rename and merge (CURA-1349)	2016-04-11 18:51:06 +02:00
qml	Move Rotation "tooltip" out of cura.qml and make it useful for other tools as well	2016-04-12 17:09:32 +02:00
shaders	Add SolidView plugin, which is what used to be Uranium's MeshView	2015-12-14 13:56:32 +01:00
themes/cura	Merge branch '2.1'	2016-04-04 18:49:09 +02:00