Salome HOME
Merge branch 'BR_1331' into BR_DEMO
authorasl <asl@opencascade.com>
Wed, 11 Oct 2017 05:23:46 +0000 (08:23 +0300)
committerasl <asl@opencascade.com>
Wed, 11 Oct 2017 05:23:46 +0000 (08:23 +0300)
commit988bd1963f29e4e923cf3fd6c06cf9033f7670ae
tree461a9f79b46e2db399df76f2b0fe82be311bfce1
parentac056ee3c8e228f5b79eca9bad0fec624c595b1b
parente2d39062ddc79748a9e94ec692162f372740e341
Merge branch 'BR_1331' into BR_DEMO

# Conflicts:
# src/HYDRO_tests/CMakeLists.txt
# src/HYDRO_tests/ExternalFiles.cmake
# src/HYDRO_tests/reference_data/CMakeLists.txt
src/HYDROGUI/HYDROGUI_ViewerDlg.h
src/HYDRO_tests/CMakeLists.txt
src/HYDRO_tests/ExternalFiles.cmake
src/HYDRO_tests/TestViewer.cxx
src/HYDRO_tests/TestViewer.h
src/HYDRO_tests/reference_data/CMakeLists.txt