Merge pull request #1117 from pmsimard/15.01_RC10_NewNotifications

author daid <daid303@gmail.com>

Mon, 2 Feb 2015 14:38:22 +0000 (15:38 +0100)

committer daid <daid303@gmail.com>

Mon, 2 Feb 2015 14:38:22 +0000 (15:38 +0100)
author daid <daid303@gmail.com>
Mon, 2 Feb 2015 14:38:22 +0000 (15:38 +0100)
committer daid <daid303@gmail.com>
Mon, 2 Feb 2015 14:38:22 +0000 (15:38 +0100)
diff --cc Cura/gui/mainWindow.py
Simple merge
diff --cc Cura/gui/sceneView.py
Simple merge
diff --cc Cura/util/objectScene.py
Simple merge
author	daid <daid303@gmail.com>
	Mon, 2 Feb 2015 14:38:22 +0000 (15:38 +0100)
committer	daid <daid303@gmail.com>
	Mon, 2 Feb 2015 14:38:22 +0000 (15:38 +0100)
		1	2
Cura/gui/mainWindow.py	patch \|	diff1 \|	diff2 \|	blob \| history
Cura/gui/sceneView.py	patch \|	diff1 \|	diff2 \|	blob \| history
Cura/util/objectScene.py	patch \|	diff1 \|	diff2 \|	blob \| history