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

author isn <isn@opencascade.com>

Thu, 25 Jun 2015 14:55:54 +0000 (17:55 +0300)

committer isn <isn@opencascade.com>

Thu, 25 Jun 2015 14:55:54 +0000 (17:55 +0300)
author isn <isn@opencascade.com>
Thu, 25 Jun 2015 14:55:54 +0000 (17:55 +0300)
committer isn <isn@opencascade.com>
Thu, 25 Jun 2015 14:55:54 +0000 (17:55 +0300)
diff --cc src/HYDROGUI/resources/HYDROGUI_msg_en.ts
Simple merge
author	isn <isn@opencascade.com>
	Thu, 25 Jun 2015 14:55:54 +0000 (17:55 +0300)
committer	isn <isn@opencascade.com>
	Thu, 25 Jun 2015 14:55:54 +0000 (17:55 +0300)