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
..
avr_isp	Merge branch '15.10'	2015-11-13 11:31:29 +01:00
__init__.py	adds/adapts translation context markers	2015-09-08 15:26:49 +02:00
ControlWindow.qml	Replace a bunch of Theme property accessors with getThing calls	2016-02-23 12:24:26 +01:00
FirmwareUpdateWindow.qml	Make progress bar determinate when at 100%	2016-02-23 17:27:17 +01:00
PrinterConnection.py	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
USBPrinterManager.py	Removing unused imports	2016-03-15 12:57:03 +01:00