]> SALOME platform Git repositories - modules/smesh.git/commitdiff
Salome HOME
Merge branch 'eap/19926_renumber' of https://codev-tuleap.cea.fr/plugins/git/salome...
authoreap <eap@opencascade.com>
Mon, 12 Oct 2020 09:07:26 +0000 (12:07 +0300)
committereap <eap@opencascade.com>
Mon, 12 Oct 2020 09:07:26 +0000 (12:07 +0300)
Conflicts:
src/StdMeshersGUI/StdMeshersGUI_BlockRenumberCreator.cxx

1  2 
src/SMESHGUI/SMESHGUI_Hypotheses.cxx

index a228b87e0823c3a8fde435c34b66f565e22d5c05,a228b87e0823c3a8fde435c34b66f565e22d5c05..b8dd20bcb4c987a06050588988f566955c715355
@@@ -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")