Ghostkeeper de9a66e1f4 Merge branch '2.1' ... Conflicts: plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py plugins/USBPrinting/PrinterConnection.py resources/machines/fdmprinter.json resources/profiles/ultimaker2+/abs_0.4_high.curaprofile		2016-03-17 15:24:00 +01:00
..
i18n	i18n: de: Correcting tooltip	2016-03-09 15:30:27 +01:00
images	Update UM2+, UM2Ex and UM2Ex+ backplates	2016-03-03 16:19:24 +01:00
machines	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
meshes	Rename inventor_platform.stl to match the rest	2016-03-03 17:21:00 +01:00
profiles	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
qml	Merge branch '2.1'	2016-03-17 15:24:00 +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	Merge branch '2.1'	2016-03-17 15:24:00 +01:00