Salome HOME
projects
/
samples
/
pyhello.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_3_BR 06/06/2011
[samples/pyhello.git]
/
resources
/
PYHELLOCatalog.xml.in
diff --git
a/resources/PYHELLOCatalog.xml.in
b/resources/PYHELLOCatalog.xml.in
index 2721725de821d3df2990d62ab17acf157d44c9c2..b722cd5814083efe800748dd646726cb372c75e1 100644
(file)
--- a/
resources/PYHELLOCatalog.xml.in
+++ b/
resources/PYHELLOCatalog.xml.in
@@
-1,6
+1,6
@@
<?xml version='1.0' encoding='us-ascii' ?>
<!--
<?xml version='1.0' encoding='us-ascii' ?>
<!--
- Copyright (C) 2007-201
0
CEA/DEN, EDF R&D, OPEN CASCADE
+ Copyright (C) 2007-201
1
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