Arjen Hiemstra d659e5b8b8 Merge branch '15.06' ...

Conflicts:
	cura/CuraApplication.py

2015-07-15 00:38:29 +02:00

..

avr_isp

Add 'plugins/USBPrinting/' from commit 'b28ca0881a6c2564f5447476f7b21de5645c10bd'

2015-04-30 12:30:37 +02:00

__init__.py

Add missing copyright headers

2015-05-11 12:18:05 +02:00

ControlWindow.qml

Fix styling of USB Printing control and firmware window

2015-07-07 11:30:00 +02:00

FirmwareUpdateWindow.qml

Fix styling of USB Printing control and firmware window

2015-07-07 11:30:00 +02:00

PrinterConnection.py

Merge branch '15.06'

2015-07-15 00:38:29 +02:00

USBPrinterManager.py

Write to the correct variable so bed temperature is properly updated

2015-07-09 16:34:04 +02:00