Merge branch 'origin/akl/single_desktop'

author vsr <vsr@opencascade.com>

Wed, 19 Feb 2014 12:10:46 +0000 (16:10 +0400)

committer vsr <vsr@opencascade.com>

Wed, 19 Feb 2014 12:10:46 +0000 (16:10 +0400)
author vsr <vsr@opencascade.com>
Wed, 19 Feb 2014 12:10:46 +0000 (16:10 +0400)
committer vsr <vsr@opencascade.com>
Wed, 19 Feb 2014 12:10:46 +0000 (16:10 +0400)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/LightApp/LightApp_Application.cxx
Simple merge
diff --cc src/SalomeApp/SalomeApp_Application.cxx
Simple merge
author	vsr <vsr@opencascade.com>
	Wed, 19 Feb 2014 12:10:46 +0000 (16:10 +0400)
committer	vsr <vsr@opencascade.com>
	Wed, 19 Feb 2014 12:10:46 +0000 (16:10 +0400)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/LightApp/LightApp_Application.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/SalomeApp/SalomeApp_Application.cxx	patch \|	diff1 \|	diff2 \|	blob \| history