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
..
3MFReader	Remove unused imports and replace object with entry	2016-03-14 15:47:17 +01:00
AutoSave	Properly save setting visibility when auto saving	2016-02-17 14:38:38 +01:00
ChangeLogPlugin	Marking unused variable	2016-03-15 12:25:10 +01:00
CuraEngineBackend	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
CuraProfileReader	Import of Logger missing here	2016-03-15 12:34:43 +01:00
CuraProfileWriter	Removing unused imports	2016-03-15 12:50:29 +01:00
GCodeProfileReader	Fix comment	2016-03-02 17:31:58 +01:00
GCodeWriter	Removing unused imports	2016-03-15 12:50:29 +01:00
ImageReader	Cleanup in plugins/ImageReader/ImageReader.py	2016-03-15 12:50:46 +01:00
LayerView	Using PyDev compatible tags	2016-03-15 12:52:29 +01:00
LegacyProfileReader	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
PerObjectSettingsTool	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
RemovableDriveOutputDevice	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
SliceInfoPlugin	Using PyDev compatible tag	2016-03-15 12:54:41 +01:00
SolidView	Removing unused imports	2016-03-15 12:57:03 +01:00
USBPrinting	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
XRayView	Added weight to viewmode plugins for sorting in the viewmode	2015-12-30 09:53:25 +01:00