Merge branch 'master' into gni/adaptation

diff --combined resources/CMakeLists.txt
index cb71c43bee74c40ffeee41a9e249655ad01e6799,1a5619a10d4baf262bff2e3f5fec2e8b53d7d632..9bc94791636afc4ff633982d2e6355bfdd0a9069
--- 1/resources/CMakeLists.txt
--- 2/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@@ -22,11 -22,6 +22,11 @@@
  
  SET(SMESH_RESOURCES_FILES
    ModuleMesh.png
 +  adapt_hom_iter_next.png
 +  adapt_hom_iter_poursuite.png
 +  adapt_mg_adapt.png
 +  adapt_ref_all.png
 +  adapt_ref_homard.png
    advanced_mesh_info.png
    bare_border_face.png
    bare_border_volume.png
@@@ -208,6 -203,7 +208,7 @@@
    mesh_tree_hypo_projection_2d.png
    mesh_tree_hypo_projection_3d.png
    mesh_tree_hypo_quadratic.png
+   mesh_tree_hypo_renumber.png
    mesh_tree_hypo_segment.png
    mesh_tree_hypo_source_3d_shape.png
    mesh_tree_hypo_source_edge.png