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
..
__init__.py	Fixin some i18n function calls and such	2016-01-12 15:24:47 +01:00
PerObjectSettingsModel.py	Grouping and per object settings now work correctly again	2016-02-23 12:55:41 +01:00
PerObjectSettingsPanel.qml	Per object settings now also uses visible depth	2016-03-15 16:15:13 +01:00
PerObjectSettingsTool.py	Removing unused import	2016-03-14 17:15:57 +01:00
SettingOverrideModel.py	Properly update global_only on profile switch	2016-02-24 13:05:52 +01:00