Tim Kuipers 883d138f67 Merge branch '2.1'		2016-05-13 12:19:19 +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	Merge branch '2.1'	2016-05-13 12:19:19 +02:00
meshes	Rename inventor_platform.stl to match the rest	2016-03-03 17:21:00 +01:00
profiles	Remove retraction settings from ulti-profile	2016-04-25 16:23:37 +02:00
qml	Add a preference for automatic update checking	2016-05-12 14:03:03 +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	Add reusable style for comboboxes to the theme	2016-04-27 10:28:58 +02:00