]> SALOME platform Git repositories - modules/hydro.git/commit
Salome HOME
Merge branch 'BR_HYDRO_IMPS_2016' of ssh://gitolite3@git.salome-platform.org/modules...
authorasl <asl@opencascade.com>
Mon, 12 Dec 2016 08:22:34 +0000 (11:22 +0300)
committerasl <asl@opencascade.com>
Mon, 12 Dec 2016 08:22:34 +0000 (11:22 +0300)
commitad4482443835973ac9ee0ce2024f60f91adff716
treec40cfa74f2b39524bcd1596b761f5890ead8cab2
parent4bef76eb65a4ad3c90ff28b84a1df70054fef8b4
parentfd7e5d3c89a0100771a0d6e29334a5213d5e0536
Merge branch 'BR_HYDRO_IMPS_2016' of ssh://gitolite3@git.salome-platform.org/modules/hydro.git into BR_PORTING_OCCT_7

Conflicts:
src/HYDROData/HYDROData_DTM.cxx
17 files changed:
src/HYDROData/HYDROData_Bathymetry.cxx
src/HYDROData/HYDROData_CalculationCase.cxx
src/HYDROData/HYDROData_CalculationCase.h
src/HYDROData/HYDROData_DTM.cxx
src/HYDROData/HYDROData_DTM.h
src/HYDROData/HYDROData_ImmersibleZone.cxx
src/HYDROData/HYDROData_LCM_FaceClassifier.h
src/HYDROData/HYDROData_LandCoverMap.cxx
src/HYDROData/HYDROData_LandCoverMap.h
src/HYDROData/HYDROData_Profile.cxx
src/HYDROData/HYDROData_Profile.h
src/HYDROPy/HYDROData_CalculationCase.sip
src/HYDRO_tests/TestViewer.cxx
src/HYDRO_tests/TestViewer.h
src/HYDRO_tests/test_HYDROData_CalcCase.cxx
src/HYDRO_tests/test_HYDROData_DTM.cxx
src/HYDRO_tests/test_HYDROData_Stream.cxx