From: daid303 <daid303@gmail.com>
Date: Fri, 12 Apr 2013 17:15:35 +0000 (+0200)
Subject: Merge branch 'master' into SteamEngine
X-Git-Tag: 13.05~104
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d45198f783d30fa8ed1137dd36b9fae34f4c8ea1;p=cura.git

Merge branch 'master' into SteamEngine

Conflicts:
	Cura/slice/__main__.py
	Cura/slice/cura_sf/fabmetheus_utilities/settings.py
---

d45198f783d30fa8ed1137dd36b9fae34f4c8ea1
diff --cc Cura/gui/util/openglGui.py
index f5223113,436fc490..a3b9588c
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@@ -287,10 -241,10 +287,12 @@@ class glGuiPanel(glcanvas.GLCanvas)
  		pass
  	def OnMouseMotion(self, e):
  		pass
 +	def OnKeyChar(self, keyCode):
 +		pass
  	def OnPaint(self, e):
  		pass
+ 	def OnKeyChar(self, keycode):
+ 		pass
  
  	def add(self, ctrl):
  		if self._container is not None: