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 branch 'OCCT780'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index 3c37a0cba2afe406f750c6e7e4279f70831cdfec..48aeb4eb49e9b062aa1d9f644a4363d82fef6c9f 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
1 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS