Merge from V6_main 01/04/2013

diff --git a/ATOMGEN_version.h.in b/ATOMGEN_version.h.in
index e039aa52fdd73f7a2f60e035d7c126150b70a9bf..e47c1867a0c928b2c4def4ab2b154c72201967f4 100644 (file)
--- a/ATOMGEN_version.h.in
+++ b/ATOMGEN_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/Makefile.am b/Makefile.am
index 295b5145ae8a175467a6ca7edb8f5ac754f796b6..2d579a4a339b380ee0b62b04210991b9b8d208f5 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am
index 9863d295024770439bf76fa8f9f4bec8bea2bc46..a8acbbd3e49b3dee78c9ec4b8f1e496d97f42535 100644 (file)
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am
index 0d5ee76b8ee459c88d1404514f27bade7d926b59..c68bae141b1b89c9b5fb6c3925fdb300f97e8303 100644 (file)
--- a/adm_local/unix/Makefile.am
+++ b/adm_local/unix/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am
index a6ec0a4b6324de9d1bce0cb05d709d631dac91ac..83dd9250b654f2009532d0e7b381d60c582dadcb 100644 (file)
--- a/adm_local/unix/config_files/Makefile.am
+++ b/adm_local/unix/config_files/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/check_ATOMGEN.m4 b/adm_local/unix/config_files/check_ATOMGEN.m4
index c06b1128c1d11b85052e8721096d14ea44a6436c..53affc0b25e76e8ceb642f019fd6984bae0c6cca 100644 (file)
--- a/adm_local/unix/config_files/check_ATOMGEN.m4
+++ b/adm_local/unix/config_files/check_ATOMGEN.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index a54d248598606954c7e47202dcbab8213284177b..168784557f732e93220c9e8292a6b2a6f955607f 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 64ec0dd6b465f668d6912b058fe006e97c152ccb..eddc548b5f4c8b4cd7bb8f99b6356ddfa63dcf88 100755 (executable)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/build_configure b/build_configure
index 0e268e18a20c75d7ebaa6ede249fe7bedd7e1743..9633c7e70070d05ce5d944ff9fcc6f36a2144eae 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/clean_configure b/clean_configure
index 9cd41eabd38754a78a7507d896c38e1adeeef226..493cd60ba1a62f33c0fddd5218a10bc36bf4a4fb 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/configure.ac b/configure.ac
index d7216108c630928910dafb6a8e044881e4f390ba..3dbfa8bc82b952488f05ba228448be72c12cd26b 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/idl/ATOMGEN.idl b/idl/ATOMGEN.idl
index 457a6baab3d1f2e827fee8df5f9d42b8f731e394..04544d051773c97e8984291a245042c114d4a213 100644 (file)
--- a/idl/ATOMGEN.idl
+++ b/idl/ATOMGEN.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 645de7cfdd7297feab882150a2b097d5d4613c3c..2f206c775af79330157d251d1c926f249eb2eb0e 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/resources/ATOMGENCatalog.xml b/resources/ATOMGENCatalog.xml
index fc2ceb0a004212a758b90da63613ffbf2a03b09e..37bc4cbc5259cee29e65e3aef86e11d47f7d6497 100644 (file)
--- a/resources/ATOMGENCatalog.xml
+++ b/resources/ATOMGENCatalog.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 
 <!--
-  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

diff --git a/resources/ATOMGEN_en.xml b/resources/ATOMGEN_en.xml
index 86232a7e7de610348f4c65f0605e8bdea53d7898..4ec7f110cdd565312496ac8811d2ab500e7c5dd2 100644 (file)
--- a/resources/ATOMGEN_en.xml
+++ b/resources/ATOMGEN_en.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 
 <!--
-  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 2519b4003b887ebcb4faabbfb0c465b2f017cef3..5c2514191bbbe8951168a678478b57d015acbb46 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 33e26ef6a759e404626813de87b3ea1ddde3ca28..f383746c0523041231f0d4154f9a63663059305f 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,6 +1,6 @@
 <!DOCTYPE document>
 <!--
-  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

diff --git a/src/ATOMGEN/ATOMGEN.py b/src/ATOMGEN/ATOMGEN.py
index ccaff11d4a8c2d0af74845ee52a360ebce1249bb..8edc3cc344d26405c4bd0fbcabc3638c5afa371f 100644 (file)
--- a/src/ATOMGEN/ATOMGEN.py
+++ b/src/ATOMGEN/ATOMGEN.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/ATOMGEN/ATOMGEN_Data.py b/src/ATOMGEN/ATOMGEN_Data.py
index 176086b8945b24bf77122a39a846dd520c2c5dab..fa02e214da58b10e6d46327cb0d0fdd2e185ed0a 100644 (file)
--- a/src/ATOMGEN/ATOMGEN_Data.py
+++ b/src/ATOMGEN/ATOMGEN_Data.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/ATOMGEN/ATOMGEN_XmlParser.py b/src/ATOMGEN/ATOMGEN_XmlParser.py
index e47b2ec1a9688c5c88e1f7802a94afc8eb077891..e08bf706f1777719ef0652922e2fce03e42bd7fb 100644 (file)
--- a/src/ATOMGEN/ATOMGEN_XmlParser.py
+++ b/src/ATOMGEN/ATOMGEN_XmlParser.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/ATOMGEN/Makefile.am b/src/ATOMGEN/Makefile.am
index 86417d1b9a34b605209c3e6c05da0b55e8a0d362..db18224186ef2f13d274852123d51fc998608ada 100644 (file)
--- a/src/ATOMGEN/Makefile.am
+++ b/src/ATOMGEN/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/ATOMGENGUI/ATOMGENGUI.py b/src/ATOMGENGUI/ATOMGENGUI.py
index b40fe37037d61149cafc0abcbcc1c29c8c2f03aa..906b69f2c82894d35ed93588a7cfc0a3ae46e1d5 100644 (file)
--- a/src/ATOMGENGUI/ATOMGENGUI.py
+++ b/src/ATOMGENGUI/ATOMGENGUI.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/ATOMGENGUI/Makefile.am b/src/ATOMGENGUI/Makefile.am
index c50df98fde93bfee7e7b51b577cf01bedac42aec..fe6e9daf2c2b526efc30f01ae3d0f4eea7a9a17f 100644 (file)
--- a/src/ATOMGENGUI/Makefile.am
+++ b/src/ATOMGENGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/Makefile.am b/src/Makefile.am
index ffd42089a53cff7a6189615282e73b6e4ea4921d..33ee7137daf72d2052097649cc7f751435f047d9 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public