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

author mkr <mkr@opencascade.com>

Thu, 25 Jun 2015 14:06:12 +0000 (17:06 +0300)

committer mkr <mkr@opencascade.com>

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