]> SALOME platform Git repositories - modules/hydro.git/commit - src/HYDRO_tests/TestViewer.cxx
Salome HOME
Merge branch 'BR_1330' into BR_DEMO
authorasl <asl@opencascade.com>
Wed, 11 Oct 2017 05:22:41 +0000 (08:22 +0300)
committerasl <asl@opencascade.com>
Wed, 11 Oct 2017 05:22:41 +0000 (08:22 +0300)
commitac056ee3c8e228f5b79eca9bad0fec624c595b1b
treef537f66ba3131622185c6d3dcfeb2b83fe28e777
parentd73a62c7e1e6715fec59c1dfca7828047279ba9e
parent44a932b81d66aeb85a55b448bff776085d00fd19
Merge branch 'BR_1330' into BR_DEMO

# Conflicts:
# src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
# src/HYDRO_tests/TestViewer.h
# src/HYDRO_tests/reference_data/Polyline_Presentation.png
src/HYDROGUI/HYDROGUI_Module.cxx
src/HYDROGUI/HYDROGUI_OCCDisplayer.h
src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
src/HYDROGUI/HYDROGUI_ShapeBathymetry.h
src/HYDROGUI/resources/HYDROGUI_msg_en.ts
src/HYDRO_tests/TestViewer.cxx
src/HYDRO_tests/TestViewer.h
src/HYDRO_tests/reference_data/CMakeLists.txt