Salome HOME
Merge branch 'occ/shaper2smesh'
authorvsr <vsr@opencascade.com>
Fri, 21 Feb 2020 12:13:04 +0000 (15:13 +0300)
committervsr <vsr@opencascade.com>
Fri, 21 Feb 2020 14:00:22 +0000 (17:00 +0300)
commit6472eab132825fec572beda8276947593f85ffa1
tree8550c65bece26f5434c94a005f98c7e605c11c78
parent13b3c4bbb9681a68f761fb305e7940698eed6fb2
parent59fe51ff7f83a733aee46ecad7adb391bc4323bf
Merge branch 'occ/shaper2smesh'
18 files changed:
resources/CMakeLists.txt
src/SMESH/SMESH_Mesh.hxx
src/SMESHGUI/SMESHGUI.cxx
src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
src/SMESHGUI/SMESHGUI_MeshOp.cxx
src/SMESHGUI/SMESHGUI_VTKUtils.cxx
src/SMESHGUI/SMESH_msg_en.ts
src/SMESHGUI/SMESH_msg_fr.ts
src/SMESH_I/SMESH_2smeshpy.cxx
src/SMESH_I/SMESH_Gen_i.cxx
src/SMESH_I/SMESH_Gen_i.hxx
src/SMESH_I/SMESH_Gen_i_1.cxx
src/SMESH_I/SMESH_Mesh_i.cxx
src/SMESH_I/SMESH_Mesh_i.hxx
src/SMESH_I/SMESH_PythonDump.cxx
src/SMESH_SWIG/smeshBuilder.py
src/SMESH_SWIG/smesh_algorithm.py
src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx