Ghostkeeper a785c9a205 Fix merge conflict resolution ... A comma was missing. Also fixed the whitespace in this file, since there were a few tabs mixed in there.		2016-03-04 11:23:35 +01:00
..
i18n	i18n: de: Moving the name of the removable drive to the right position	2016-02-07 16:02:03 +01:00
images	Update UM2+, UM2Ex and UM2Ex+ backplates	2016-03-03 16:19:24 +01:00
machines	Fix merge conflict resolution	2016-03-04 11:23:35 +01:00
meshes	Rename inventor_platform.stl to match the rest	2016-03-03 17:21:00 +01:00
profiles	Merge branch '2.1' of https://github.com/Ultimaker/Cura	2016-03-04 10:59:40 +01:00
qml	Merge branch '2.1' of https://github.com/Ultimaker/Cura	2016-03-04 10:59:40 +01:00
shaders	Add SolidView plugin, which is what used to be Uranium's MeshView	2015-12-14 13:56:32 +01:00
themes/cura	Tweak layer slider appearance	2016-03-03 09:00:52 +01:00