Ghostkeeper da1d59ff98 Merge branch 15.10 into master ... Where automatic merging failed, the version of 15.10 was used.		2015-10-16 16:56:59 +02:00
..
avr_isp	Add 'plugins/USBPrinting/' from commit 'b28ca0881a'	2015-04-30 12:30:37 +02:00
__init__.py	adds/adapts translation context markers	2015-09-08 15:26:49 +02:00
ControlWindow.qml	Made print window non blocking modal	2015-09-07 14:03:56 +02:00
FirmwareUpdateWindow.qml	Make sure we have a catalog to read translations from	2015-09-18 12:15:21 +02:00
PrinterConnection.py	Merge branch 15.10 into master	2015-10-16 16:56:59 +02:00
USBPrinterManager.py	Fixes that the firmware update kan be called from the add machine -> add UMO wizard	2015-10-14 16:03:29 +02:00