Merge tag 'V_2.4.0' into cgt/V240

author Clarisse Genrault <clarisse.genrault@cea.fr>

Fri, 1 Jul 2016 10:32:51 +0000 (12:32 +0200)

committer Clarisse Genrault <clarisse.genrault@cea.fr>

Fri, 1 Jul 2016 10:32:51 +0000 (12:32 +0200)
author Clarisse Genrault <clarisse.genrault@cea.fr>
Fri, 1 Jul 2016 10:32:51 +0000 (12:32 +0200)
committer Clarisse Genrault <clarisse.genrault@cea.fr>
Fri, 1 Jul 2016 10:32:51 +0000 (12:32 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/ConstructionPlugin/CMakeLists.txt
Simple merge
author	Clarisse Genrault <clarisse.genrault@cea.fr>
	Fri, 1 Jul 2016 10:32:51 +0000 (12:32 +0200)
committer	Clarisse Genrault <clarisse.genrault@cea.fr>
	Fri, 1 Jul 2016 10:32:51 +0000 (12:32 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/ConstructionPlugin/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history