Merge commit '9dd90968eb8ad86e7e6ae67f48bb6110bd4ffbdc' into BR_LCM_COMP

author isn <isn@opencascade.com>

Fri, 13 Nov 2015 17:08:41 +0000 (20:08 +0300)

committer isn <isn@opencascade.com>

Fri, 13 Nov 2015 17:08:41 +0000 (20:08 +0300)
author isn <isn@opencascade.com>
Fri, 13 Nov 2015 17:08:41 +0000 (20:08 +0300)
committer isn <isn@opencascade.com>
Fri, 13 Nov 2015 17:08:41 +0000 (20:08 +0300)
diff --cc src/HYDROData/HYDROData_LandCoverMap.cxx
Simple merge
diff --cc src/HYDROData/HYDROData_LandCoverMap.h
Simple merge
diff --cc src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
Simple merge
author	isn <isn@opencascade.com>
	Fri, 13 Nov 2015 17:08:41 +0000 (20:08 +0300)
committer	isn <isn@opencascade.com>
	Fri, 13 Nov 2015 17:08:41 +0000 (20:08 +0300)
		1	2
src/HYDROData/HYDROData_LandCoverMap.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/HYDROData/HYDROData_LandCoverMap.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx	patch \|	diff1 \|	diff2 \|	blob \| history