Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

author isn <isn@opencascade.com>

Fri, 26 Jun 2015 09:18:11 +0000 (12:18 +0300)

committer isn <isn@opencascade.com>

Fri, 26 Jun 2015 09:18:11 +0000 (12:18 +0300)
author isn <isn@opencascade.com>
Fri, 26 Jun 2015 09:18:11 +0000 (12:18 +0300)
committer isn <isn@opencascade.com>
Fri, 26 Jun 2015 09:18:11 +0000 (12:18 +0300)
diff --cc src/HYDROGUI/CMakeLists.txt
Simple merge
author	isn <isn@opencascade.com>
	Fri, 26 Jun 2015 09:18:11 +0000 (12:18 +0300)
committer	isn <isn@opencascade.com>
	Fri, 26 Jun 2015 09:18:11 +0000 (12:18 +0300)