Merge pull request #561 from hg42/allow-dropping-gcode

author daid <daid303@gmail.com>

Thu, 19 Sep 2013 12:56:31 +0000 (05:56 -0700)

committer daid <daid303@gmail.com>

Thu, 19 Sep 2013 12:56:31 +0000 (05:56 -0700)
author daid <daid303@gmail.com>
Thu, 19 Sep 2013 12:56:31 +0000 (05:56 -0700)
committer daid <daid303@gmail.com>
Thu, 19 Sep 2013 12:56:31 +0000 (05:56 -0700)
diff --cc Cura/gui/mainWindow.py
Simple merge
diff --cc Cura/gui/sceneView.py
Simple merge
author	daid <daid303@gmail.com>
	Thu, 19 Sep 2013 12:56:31 +0000 (05:56 -0700)
committer	daid <daid303@gmail.com>
	Thu, 19 Sep 2013 12:56:31 +0000 (05:56 -0700)
		1	2
Cura/gui/mainWindow.py	patch \|	diff1 \|	diff2 \|	blob \| history
Cura/gui/sceneView.py	patch \|	diff1 \|	diff2 \|	blob \| history