Merge branch 'master' of ssh://git.salome-platform.org/modules/med

author abn <adrien.bruneton@cea.fr>

Fri, 5 Aug 2016 13:29:00 +0000 (15:29 +0200)

committer abn <adrien.bruneton@cea.fr>

Fri, 5 Aug 2016 13:29:00 +0000 (15:29 +0200)
author abn <adrien.bruneton@cea.fr>
Fri, 5 Aug 2016 13:29:00 +0000 (15:29 +0200)
committer abn <adrien.bruneton@cea.fr>
Fri, 5 Aug 2016 13:29:00 +0000 (15:29 +0200)
diff --cc src/MEDCalc/gui/CMakeLists.txt
Simple merge
author	abn <adrien.bruneton@cea.fr>
	Fri, 5 Aug 2016 13:29:00 +0000 (15:29 +0200)
committer	abn <adrien.bruneton@cea.fr>
	Fri, 5 Aug 2016 13:29:00 +0000 (15:29 +0200)