Salome HOME
Merge remote-tracking branch 'origin/BR_1323_0' into BR_2017
authorasl <asl@opencascade.com>
Tue, 7 Nov 2017 12:29:06 +0000 (15:29 +0300)
committerasl <asl@opencascade.com>
Tue, 7 Nov 2017 12:29:06 +0000 (15:29 +0300)
commit07c29bb9bda552734178a94c59e6c3cd6881b754
tree9cf1132d1cfccb6b72300e2052c8a2e09159f3e3
parent77396ccfa6d8d3666005deafec6c55b929d59281
parent3f9972d2fe8d50b81f6126f1128ce823c81df4e5
Merge remote-tracking branch 'origin/BR_1323_0' into BR_2017

# Conflicts:
# src/HYDROGUI/CMakeLists.txt
# src/HYDROGUI/HYDROGUI_Operations.cxx
# src/HYDROGUI/HYDROGUI_Operations.h
src/HYDROGUI/CMakeLists.txt
src/HYDROGUI/HYDROGUI_DataObject.cxx
src/HYDROGUI/HYDROGUI_Module.cxx
src/HYDROGUI/HYDROGUI_Operations.cxx
src/HYDROGUI/HYDROGUI_Operations.h
src/HYDROGUI/resources/HYDROGUI_msg_en.ts
src/HYDRO_tests/ExternalFiles.cmake
src/HYDRO_tests/reference_data/CMakeLists.txt