Merge remote-tracking branch 'remotes/origin/BR_PORTING_OCCT_7' into BR_PORTING_OCCT_7

author isn <isn@opencascade.com>

Mon, 12 Dec 2016 11:51:07 +0000 (14:51 +0300)

committer isn <isn@opencascade.com>

Mon, 12 Dec 2016 11:51:07 +0000 (14:51 +0300)
author isn <isn@opencascade.com>
Mon, 12 Dec 2016 11:51:07 +0000 (14:51 +0300)
committer isn <isn@opencascade.com>
Mon, 12 Dec 2016 11:51:07 +0000 (14:51 +0300)
diff --cc src/HYDROData/HYDROData_LandCoverMap.cxx
Simple merge
author	isn <isn@opencascade.com>
	Mon, 12 Dec 2016 11:51:07 +0000 (14:51 +0300)
committer	isn <isn@opencascade.com>
	Mon, 12 Dec 2016 11:51:07 +0000 (14:51 +0300)