Jaime van Kessel 66e50ceb37 Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06 ... Conflicts: plugins/LayerView/LayerView.py		2015-06-05 17:43:34 +02:00
..
CuraEngineBackend	Do not slice if there is any setting with an error value	2015-05-27 16:25:39 +02:00
GCodeWriter	Add missing copyright headers	2015-05-11 12:18:05 +02:00
LayerView	Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06	2015-06-05 17:43:34 +02:00
USBPrinting	Updated name in menu for firmware update	2015-06-05 13:26:51 +02:00