From: eap <eap@opencascade.com>
Date: Mon, 12 Oct 2020 09:07:26 +0000 (+0300)
Subject: Merge branch 'eap/19926_renumber' of https://codev-tuleap.cea.fr/plugins/git/salome... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=31c496eb37aa9f05f6f5da983b41a7ebb64c0134;p=modules%2Fsmesh.git

Merge branch 'eap/19926_renumber' of https://codev-tuleap.cea.fr/plugins/git/salome/smesh into eap/19926_renumber

Conflicts:
	src/StdMeshersGUI/StdMeshersGUI_BlockRenumberCreator.cxx
---

31c496eb37aa9f05f6f5da983b41a7ebb64c0134
diff --cc src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index a228b87e0,a228b87e0..b8dd20bcb
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
@@@ -605,7 -605,7 +605,7 @@@ QString SMESHGUI_GenericHypothesisCreat
    else if ( aHypType == "MaxElementArea")
      aHelpFileName = "2d_meshing_hypo.html#max-element-area-anchor";
    else if ( aHypType == "MaxElementVolume")
--    aHelpFileName = "max_element_volume_hypo.html";
++    aHelpFileName = "3d_meshing_hypo.html#d-meshing-hypotheses";
    else if ( aHypType == "StartEndLength")
      aHelpFileName = "1d_meshing_hypo.html#start-and-end-length-anchor";
    else if ( aHypType == "Deflection1D")