Cura/plugins/RemovableDriveOutputDevice
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 Use the right catalog for RemovableDriveOutputDevice 2015-09-11 14:47:53 +02:00
LinuxRemovableDrivePlugin.py RemovableDriveOutputDevice: Making output of uname command useful 2016-03-14 17:03:08 +01:00
OSXRemovableDrivePlugin.py Merge branch '2.1' 2016-03-17 15:24:00 +01:00
RemovableDriveOutputDevice.py Merge branch '2.1' 2016-03-17 15:24:00 +01:00
RemovableDrivePlugin.py Removing unused imports 2016-03-15 12:53:07 +01:00
WindowsRemovableDrivePlugin.py Merge branch '2.1' 2016-03-17 15:24:00 +01:00