Merge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_SHP_FORMAT2

author isn <isn@opencascade.com>

Mon, 9 Nov 2015 13:44:45 +0000 (16:44 +0300)

committer isn <isn@opencascade.com>

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