Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index d25b65970ef32240d3939f6cc4d85ac96475330e..6bba06313aced59eb31f9ac401b664c94b0062f1 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@
-462,9
+462,9
@@
void SMESHGUI_MergeDlg::Init()
updateControls();
if ( myAction == MERGE_NODES )
updateControls();
if ( myAction == MERGE_NODES )
- myHelpFileName = "merging_nodes
_page
.html";
+ myHelpFileName = "merging_nodes.html";
else
else
- myHelpFileName = "merging_elements
_page
.html";
+ myHelpFileName = "merging_elements.html";
}
//=================================================================================
}
//=================================================================================