]> SALOME platform Git repositories - modules/hydro.git/commit
Salome HOME
Merge remote-tracking branch 'origin/BR_LAND_COVER_MAP' into BR_LAND_COVER_REMOVING
authorasl <asl@opencascade.com>
Tue, 20 Oct 2015 10:12:22 +0000 (13:12 +0300)
committerasl <asl@opencascade.com>
Tue, 20 Oct 2015 10:12:22 +0000 (13:12 +0300)
commitdcc909ad422bdc89b0fdcf7fb21df1db6271c88d
tree04be20333489663b17f3eb77f82322fe5f4abd5b
parentc97445698e2e2de4b03e82e844f2490b8ecbe211
parentd143d9fbeb31ba0e60c4dcf41988e4c2c7b0ad84
Merge remote-tracking branch 'origin/BR_LAND_COVER_MAP' into BR_LAND_COVER_REMOVING

Conflicts:
src/HYDRO_tests/TestViewer.cxx
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
src/HYDRO_tests/test_HYDROData_LandCoverMap.h
src/HYDROData/HYDROData_LandCoverMap.h
src/HYDROData/HYDROData_ShapeFile.cxx
src/HYDROData/HYDROData_ShapeFile.h
src/HYDRO_tests/CMakeLists.txt
src/HYDRO_tests/TestViewer.cxx
src/HYDRO_tests/TestViewer.h
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
src/HYDRO_tests/test_HYDROData_LandCoverMap.h