Merge branch 'master' into omu/updatetests

author Ovidiu Mircescu <ovidiu.mircescu@edf.fr>

Mon, 26 Jan 2015 15:56:56 +0000 (16:56 +0100)

committer Ovidiu Mircescu <ovidiu.mircescu@edf.fr>

Mon, 26 Jan 2015 15:56:56 +0000 (16:56 +0100)
author Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
Mon, 26 Jan 2015 15:56:56 +0000 (16:56 +0100)
committer Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
Mon, 26 Jan 2015 15:56:56 +0000 (16:56 +0100)
diff --cc src/Launcher/CMakeLists.txt
Simple merge
diff --cc src/Launcher/SALOME_Launcher.cxx
Simple merge
diff --cc src/LifeCycleCORBA/Test/LifeCycleCORBATest.cxx
Simple merge
author	Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
	Mon, 26 Jan 2015 15:56:56 +0000 (16:56 +0100)
committer	Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
	Mon, 26 Jan 2015 15:56:56 +0000 (16:56 +0100)
		1	2
src/Launcher/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/Launcher/SALOME_Launcher.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/LifeCycleCORBA/Test/LifeCycleCORBATest.cxx	patch \|	diff1 \|	diff2 \|	blob \| history