Merge pull request #564 from hg42/allow-dropping-profile

author daid <daid303@gmail.com>

Tue, 24 Sep 2013 13:58:51 +0000 (06:58 -0700)

committer daid <daid303@gmail.com>

Tue, 24 Sep 2013 13:58:51 +0000 (06:58 -0700)
author daid <daid303@gmail.com>
Tue, 24 Sep 2013 13:58:51 +0000 (06:58 -0700)
committer daid <daid303@gmail.com>
Tue, 24 Sep 2013 13:58:51 +0000 (06:58 -0700)
diff --cc Cura/gui/mainWindow.py
Simple merge
diff --cc Cura/gui/sceneView.py
Simple merge
author	daid <daid303@gmail.com>
	Tue, 24 Sep 2013 13:58:51 +0000 (06:58 -0700)
committer	daid <daid303@gmail.com>
	Tue, 24 Sep 2013 13:58:51 +0000 (06:58 -0700)
		1	2
Cura/gui/mainWindow.py	patch \|	diff1 \|	diff2 \|	blob \| history
Cura/gui/sceneView.py	patch \|	diff1 \|	diff2 \|	blob \| history