Salome HOME
Merge branch 'master' into gni/adaptation
authorGérald NICOLAS <gerald.nicolas@edf.fr>
Wed, 27 May 2020 08:36:49 +0000 (10:36 +0200)
committerGérald NICOLAS <gerald.nicolas@edf.fr>
Wed, 27 May 2020 08:36:49 +0000 (10:36 +0200)
commit0937b58dc20a4c912951ca72315009723949ffe2
treec419c1ae7e3fc38935280c17ad20f2f41551c557
parent93ad4359b074e4a3743dc485affbd865163f71e1
Merge branch 'master' into gni/adaptation
14 files changed:
resources/CMakeLists.txt
resources/mesh_auto_colors.png [new file with mode: 0644]
resources/mesh_compute_error.png [new file with mode: 0644]
resources/mesh_export.png [new file with mode: 0644]
src/SMESHGUI/SMESHGUI.cxx
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
src/SMESHGUI/SMESHGUI_ComputeDlg.h
src/SMESHGUI/SMESHGUI_MeshOp.cxx
src/SMESHGUI/SMESHGUI_Operations.h
src/SMESHGUI/SMESHGUI_Selection.cxx
src/SMESHGUI/SMESHGUI_Selection.h
src/SMESHGUI/SMESH_images.ts
src/SMESHGUI/SMESH_msg_en.ts
src/SMESH_I/SMESH_Mesh_i.cxx