Merge pull request #1067 from pmsimard/15.01_RC6_SDFolderStructure

author daid <daid303@gmail.com>

Wed, 7 Jan 2015 13:51:31 +0000 (14:51 +0100)

committer daid <daid303@gmail.com>

Wed, 7 Jan 2015 13:51:31 +0000 (14:51 +0100)
author daid <daid303@gmail.com>
Wed, 7 Jan 2015 13:51:31 +0000 (14:51 +0100)
committer daid <daid303@gmail.com>
Wed, 7 Jan 2015 13:51:31 +0000 (14:51 +0100)
diff --cc Cura/gui/sceneView.py
Simple merge
diff --cc Cura/util/profile.py
Simple merge
author	daid <daid303@gmail.com>
	Wed, 7 Jan 2015 13:51:31 +0000 (14:51 +0100)
committer	daid <daid303@gmail.com>
	Wed, 7 Jan 2015 13:51:31 +0000 (14:51 +0100)
		1	2
Cura/gui/sceneView.py	patch \|	diff1 \|	diff2 \|	blob \| history
Cura/util/profile.py	patch \|	diff1 \|	diff2 \|	blob \| history