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
..
general	Revert "Reimport default profiles from 15.04.04" because I did not oversee	2016-03-10 13:45:00 +01:00
materials	Removed profile settings that already were on default	2016-03-11 11:54:31 +01:00
ultimaker2+	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
ultimaker2_olsson	profiles: machine_nozzle_size ==> line_width (CURA-1097)	2016-03-10 12:08:06 +01:00