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

author isn <isn@opencascade.com>

Fri, 13 Nov 2015 12:35:35 +0000 (15:35 +0300)

committer isn <isn@opencascade.com>

Fri, 13 Nov 2015 12:36:39 +0000 (15:36 +0300)
author isn <isn@opencascade.com>
Fri, 13 Nov 2015 12:35:35 +0000 (15:35 +0300)
committer isn <isn@opencascade.com>
Fri, 13 Nov 2015 12:36:39 +0000 (15:36 +0300)
diff --cc src/HYDROData/HYDROData_LandCoverMap.cxx
Simple merge
diff --cc src/HYDROData/HYDROData_LandCoverMap.h
Simple merge
diff --cc src/HYDRO_tests/TestViewer.cxx
Simple merge
diff --cc src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
Simple merge
author	isn <isn@opencascade.com>
	Fri, 13 Nov 2015 12:35:35 +0000 (15:35 +0300)
committer	isn <isn@opencascade.com>
	Fri, 13 Nov 2015 12:36:39 +0000 (15:36 +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/TestViewer.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx	patch \|	diff1 \|	diff2 \|	blob \| history