Salome HOME
projects
/
modules
/
visu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V5_1_main branch 14/05/2010
[modules/visu.git]
/
src
/
CONVERTOR
/
VISU_MergeFilter.hxx
diff --git
a/src/CONVERTOR/VISU_MergeFilter.hxx
b/src/CONVERTOR/VISU_MergeFilter.hxx
index d0a07f8677903ccf5b07e984b50577fa9b26a51f..97e689261ac31b1f92dcc44a0b9adbffa80fa78d 100644
(file)
--- a/
src/CONVERTOR/VISU_MergeFilter.hxx
+++ b/
src/CONVERTOR/VISU_MergeFilter.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SALOME VTKViewer : build VTK viewer into Salome desktop
// File :
// Author :
// SALOME VTKViewer : build VTK viewer into Salome desktop
// File :
// Author :