Merge tag '14.12' into upstream

Conflicts:
	Cura/gui/app.py
	Cura/gui/configWizard.py
	Cura/gui/firmwareInstall.py
	Cura/util/bigDataStorage.py
	Cura/util/profile.py
	package.sh

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index eb2eb250b0c06e3b126141ce719d97a34c4b349e..6356df6491486bdc8cb380da8fbf6dd4f347dd80 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -502,6 +502,9 @@ class printWindowBasic(wx.Frame):
                        preventComputerFromSleeping(self._isPrinting)
 
 
+       def _addTermLog(self, msg):
+               pass
+
        def _addTermLog(self, msg):
                pass