Merge branch '2.1'

Browse source

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

...

This commit is contained in:

Ghostkeeper 2016-03-17 15:24:00 +01:00

parent 14f5d236b2 479c6c3319

commit de9a66e1f4

47 changed files with 248 additions and 154 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files