From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Thu, 15 Jan 2015 19:19:24 +0000 (-0500)
Subject: Merge tag '14.12' into upstream
X-Git-Tag: lulzbot-14.12-rc1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=712fe87b4a0e0fe4242aa620cc36ff0efb039f03;hp=2fbb3b352e0077948073a1204daddb65c5a3e75c;p=cura.git

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 eb2eb250..6356df64 100644
--- 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