Merge branch 'BR_LCM_COMP' into HEAD

author isn <isn@opencascade.com>

Mon, 16 Nov 2015 19:22:20 +0000 (22:22 +0300)

committer isn <isn@opencascade.com>

Mon, 16 Nov 2015 19:22:20 +0000 (22:22 +0300)
author isn <isn@opencascade.com>
Mon, 16 Nov 2015 19:22:20 +0000 (22:22 +0300)
committer isn <isn@opencascade.com>
Mon, 16 Nov 2015 19:22:20 +0000 (22:22 +0300)
diff --cc src/HYDROGUI/resources/HYDROGUI_msg_en.ts
Simple merge
author	isn <isn@opencascade.com>
	Mon, 16 Nov 2015 19:22:20 +0000 (22:22 +0300)
committer	isn <isn@opencascade.com>
	Mon, 16 Nov 2015 19:22:20 +0000 (22:22 +0300)