Salome HOME
Merge remote-tracking branch 'origin/V9_5_BR'
authoreap <eap@opencascade.com>
Fri, 10 Jul 2020 16:33:14 +0000 (19:33 +0300)
committereap <eap@opencascade.com>
Fri, 10 Jul 2020 16:33:14 +0000 (19:33 +0300)
commitd55dbe18f5a898be97fbc9cf66d189a1398bae0f
tree8be980410b44126e0537c845cdfa7307ea12e3df
parent29c693b1c362e8045aaab556ec5d8c612294e22e
parent9beb8d27644a2b0e2585bea7f990457a3d80d643
Merge remote-tracking branch 'origin/V9_5_BR'

Conflicts:
src/SMESH_I/SMESH_Mesh_i.cxx
CMakeLists.txt
src/SMESHGUI/SMESHGUI_Selection.cxx
src/SMESHGUI/SMESHGUI_Selection.h
src/SMESH_I/SMESH_Mesh_i.cxx