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

author mkr <mkr@opencascade.com>

Fri, 26 Jun 2015 12:18:44 +0000 (15:18 +0300)

committer mkr <mkr@opencascade.com>

Fri, 26 Jun 2015 12:18:44 +0000 (15:18 +0300)
author mkr <mkr@opencascade.com>
Fri, 26 Jun 2015 12:18:44 +0000 (15:18 +0300)
committer mkr <mkr@opencascade.com>
Fri, 26 Jun 2015 12:18:44 +0000 (15:18 +0300)
diff --cc src/HYDROGUI/HYDROGUI_Module.cxx
Simple merge
author	mkr <mkr@opencascade.com>
	Fri, 26 Jun 2015 12:18:44 +0000 (15:18 +0300)
committer	mkr <mkr@opencascade.com>
	Fri, 26 Jun 2015 12:18:44 +0000 (15:18 +0300)