]> SALOME platform Git repositories - modules/hydro.git/commit - src/HYDROGUI/HYDROGUI_Zone.cxx
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)
commite423cfd15575a1feb27386b5516bd0c83bed5fe9
tree1ecafbe6f8aeabda067124db2f46664b093b3bf1
parent883fcee9452fd4ac5e854e08551703e6dbc6678f
parent43fbb9c3c013783f1af8e4d6211ac436da5e024a
Merge remote-tracking branch 'origin/BR_LAND_COVER_REMOVING' into BR_LAND_COVER_MAP

Conflicts:
src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.cxx
src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.h
src/HYDRO_tests/TestViewer.cxx
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx