]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Merge remote-tracking branch 'origin/BR_LAND_COVER_REMOVING' into BR_LAND_COVER_MAP
authorasl <asl@opencascade.com>
Wed, 21 Oct 2015 08:25:14 +0000 (11:25 +0300)
committerasl <asl@opencascade.com>
Wed, 21 Oct 2015 08:25:14 +0000 (11:25 +0300)
Conflicts:
src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.cxx
src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.h
src/HYDRO_tests/TestViewer.cxx

1  2 
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx