Merge branch 'V7_dev'

author vsr <vsr@opencascade.com>

Fri, 25 Mar 2016 10:51:28 +0000 (13:51 +0300)

committer vsr <vsr@opencascade.com>

Fri, 25 Mar 2016 10:51:28 +0000 (13:51 +0300)
author vsr <vsr@opencascade.com>
Fri, 25 Mar 2016 10:51:28 +0000 (13:51 +0300)
committer vsr <vsr@opencascade.com>
Fri, 25 Mar 2016 10:51:28 +0000 (13:51 +0300)
diff --cc CMakeLists.txt
Simple merge
diff --cc CMakeModules/SalomeSetupPlatform.cmake
Simple merge
author	vsr <vsr@opencascade.com>
	Fri, 25 Mar 2016 10:51:28 +0000 (13:51 +0300)
committer	vsr <vsr@opencascade.com>
	Fri, 25 Mar 2016 10:51:28 +0000 (13:51 +0300)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
CMakeModules/SalomeSetupPlatform.cmake	patch \|	diff1 \|	diff2 \|	blob \| history