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

author mzn <mzn@opencascade.com>

Mon, 22 Jun 2015 11:15:49 +0000 (14:15 +0300)

committer mzn <mzn@opencascade.com>

Mon, 22 Jun 2015 11:15:49 +0000 (14:15 +0300)
author mzn <mzn@opencascade.com>
Mon, 22 Jun 2015 11:15:49 +0000 (14:15 +0300)
committer mzn <mzn@opencascade.com>
Mon, 22 Jun 2015 11:15:49 +0000 (14:15 +0300)
diff --cc src/HYDROGUI/resources/HYDROGUI_msg_en.ts
Simple merge
author	mzn <mzn@opencascade.com>
	Mon, 22 Jun 2015 11:15:49 +0000 (14:15 +0300)
committer	mzn <mzn@opencascade.com>
	Mon, 22 Jun 2015 11:15:49 +0000 (14:15 +0300)