Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT

author isn <isn@opencascade.com>

Fri, 19 Jun 2015 08:24:58 +0000 (11:24 +0300)

committer isn <isn@opencascade.com>

Fri, 19 Jun 2015 08:24:58 +0000 (11:24 +0300)
author isn <isn@opencascade.com>
Fri, 19 Jun 2015 08:24:58 +0000 (11:24 +0300)
committer isn <isn@opencascade.com>
Fri, 19 Jun 2015 08:24:58 +0000 (11:24 +0300)
diff --cc src/HYDROGUI/resources/HYDROGUI_msg_en.ts
Simple merge
author	isn <isn@opencascade.com>
	Fri, 19 Jun 2015 08:24:58 +0000 (11:24 +0300)
committer	isn <isn@opencascade.com>
	Fri, 19 Jun 2015 08:24:58 +0000 (11:24 +0300)