]> SALOME platform Git repositories - modules/hydro.git/commit
Salome HOME
Merge branch 'BR_1328' into BR_DEMO
authorasl <asl@opencascade.com>
Wed, 11 Oct 2017 05:21:03 +0000 (08:21 +0300)
committerasl <asl@opencascade.com>
Wed, 11 Oct 2017 05:21:03 +0000 (08:21 +0300)
commitd73a62c7e1e6715fec59c1dfca7828047279ba9e
treed7769bb0bc7ff68ea52ea9e2875cd1fd09f0dbca
parent6d2e20c04ccf2165b7fff1c0ecdb8fcffd0895f4
parent511c5b40429730c2f48b5df8c15538ddb2c1fc28
Merge branch 'BR_1328' into BR_DEMO

# Conflicts:
# src/HYDRO_tests/CMakeLists.txt
# src/HYDRO_tests/reference_data/CMakeLists.txt
src/HYDROGUI/CMakeLists.txt
src/HYDROGUI/HYDROGUI_Module.cxx
src/HYDROGUI/HYDROGUI_Module.h
src/HYDROGUI/resources/HYDROGUI_msg_en.ts
src/HYDRO_tests/CMakeLists.txt
src/HYDRO_tests/TestViewer.cxx
src/HYDRO_tests/TestViewer.h
src/HYDRO_tests/reference_data/CMakeLists.txt
src/HYDRO_tests/test_HYDROData_Main.cxx