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

author asl <asl@opencascade.com>

Mon, 16 Nov 2015 04:37:06 +0000 (07:37 +0300)

committer asl <asl@opencascade.com>

Mon, 16 Nov 2015 04:37:06 +0000 (07:37 +0300)
author asl <asl@opencascade.com>
Mon, 16 Nov 2015 04:37:06 +0000 (07:37 +0300)
committer asl <asl@opencascade.com>
Mon, 16 Nov 2015 04:37:06 +0000 (07:37 +0300)
diff --cc src/HYDROData/HYDROData_LandCoverMap.cxx
Simple merge
diff --cc src/HYDRO_tests/TestViewer.cxx
Simple merge
diff --cc src/HYDRO_tests/TestViewer.h
Simple merge
diff --cc src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
Simple merge
author	asl <asl@opencascade.com>
	Mon, 16 Nov 2015 04:37:06 +0000 (07:37 +0300)
committer	asl <asl@opencascade.com>
	Mon, 16 Nov 2015 04:37:06 +0000 (07:37 +0300)
		1	2
src/HYDROData/HYDROData_LandCoverMap.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/HYDRO_tests/TestViewer.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/HYDRO_tests/TestViewer.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx	patch \|	diff1 \|	diff2 \|	blob \| history