Merge from V6_main 01/04/2013

diff --git a/Makefile.am b/Makefile.am
index 2fdac46bbb1fdf8e08fc26dc62c285da73bd5045..4c4af1549410a899d110920fc2c11d34cee03671 100644 (file)
--- 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 098cd062044334b35cf6ea10f108030bf9ddd9b4..59ad711ed7d990a0509377ad8e0b155450a040ee 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_PYHELLO.m4 b/adm_local/unix/config_files/check_PYHELLO.m4
index c608d553940b36ba2e5d211e535dcb27dda4edf2..6b8e638c0a89923ae377b46f6924796ea0be9da8 100755 (executable)
--- a/adm_local/unix/config_files/check_PYHELLO.m4
+++ b/adm_local/unix/config_files/check_PYHELLO.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 4f70a7077a6ba24a12fb78f8200de1078912de4f..e6cf13ede4be231bffffb9e289f2b1b65d613ae1 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 18078216292c1d92d67d2af14af562e717dd723b..57baf6e84ba4f050503c2ccf36e6ada54023876b 100644 (file)
--- 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/bin/myrunSalome.py b/bin/myrunSalome.py
index 35e0e83f4215865c5c961fc9c580bb66847c5ccc..dc7fc55b6191e890b2024189c49d8c8beabf06d2 100755 (executable)
--- a/bin/myrunSalome.py
+++ b/bin/myrunSalome.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  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

diff --git a/bin/runAppli.in b/bin/runAppli.in
index d6c6205bb1ccaca99520966f406bbe79de7274e6..244c4dfd7103b5f801700274e5f473b46126f18b 100755 (executable)
--- a/bin/runAppli.in
+++ b/bin/runAppli.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  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

diff --git a/build_cmake b/build_cmake
index 840cf0cfb885a7f30e100effea417998315b3950..dfe7b2c3c0144845583d6db224d495ccac7c9ed8 100755 (executable)
--- a/build_cmake
+++ b/build_cmake
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 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_cmake.bat b/build_cmake.bat
index 07f37f965138f0a9721ac81905f961a555c4f826..d3770cf4977841649e06f398d3d518d7b852abc8 100644 (file)
--- a/build_cmake.bat
+++ b/build_cmake.bat
@@ -1,4 +1,4 @@
-@REM Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+@REM Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 @REM
 @REM This library is free software; you can redistribute it and/or
 @REM modify it under the terms of the GNU Lesser General Public

diff --git a/build_configure b/build_configure
index 04717ef9c1b589e1a4332734af703577e55a3198..7d7e53a33ca5c5e7cf1a6f6a65350b20d65701bb 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  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

diff --git a/clean_configure b/clean_configure
index 1f4c3ce9f40e451c2b7a77f2b9ca7158376eb6e6..2a63bf264376e4ad33551328926c7b3f0b495389 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 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 d66244706b1378521c5bcc52fbff8d32f861cde3..d0fe91c5c23971b39651a33933c70c2730d6c2cc 100644 (file)
--- 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/doc/Makefile.am b/doc/Makefile.am
index f30e7bbaa8c7c7af8e9081ac085c2ff99656fe35..3b68d73e2caba305e6a63ad1ec40c27b0f53e4a3 100755 (executable)
--- a/doc/Makefile.am
+++ b/doc/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/doc/doxyfile.in b/doc/doxyfile.in
index 08d4b5d4d7af8a6f36c1fd8ae0fc38af823c99a4..c277cf09f26d21c86de7d7cc89c25b8260eb21f6 100755 (executable)
--- a/doc/doxyfile.in
+++ b/doc/doxyfile.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
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/doc/static/footer.html b/doc/static/footer.html
index 4c89a2ba1ed1150de49b5f1bc72ca9975f411550..f89cfbbeca2fcc6b44b7434ec9eda3d458b036e1 100755 (executable)
--- a/doc/static/footer.html
+++ b/doc/static/footer.html
@@ -3,10 +3,8 @@
  </div>
  <div class="footer1">
  <div style="text-align: center;">
- Copyright &copy; 2007-2012  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
- Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
+ Copyright &copy; 2007-2013  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
  </div>
  </div>
 </body>
 </html>
-               
\ No newline at end of file

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 62f3146db0736606d0dd2a6099d58c0062b46563..83b51d8031244864d78827b51bb308783561c680 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/idl/PYHELLO_Gen.idl b/idl/PYHELLO_Gen.idl
index 8e852d32b390d7160b4ec64a08abb145b82a392e..296af6ae81935923d1ddd40091093b19b0f60b08 100644 (file)
--- a/idl/PYHELLO_Gen.idl
+++ b/idl/PYHELLO_Gen.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
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/resources/Makefile.am b/resources/Makefile.am
index f420c40eda688be776b8faddc2c4602564b13408..4819f2e2635dfdf07172e7c7d4a59db203d95d88 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/PYHELLOCatalog.xml.in b/resources/PYHELLOCatalog.xml.in
index 7f81d2a52f15d3aa265e80daee468d5de80b622a..369dd4dd111dd36683065c130fda3cdef4896ca1 100644 (file)
--- a/resources/PYHELLOCatalog.xml.in
+++ b/resources/PYHELLOCatalog.xml.in
@@ -1,6 +1,6 @@
 <?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
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index c04ca605fbe7c36637a630120790daffbda9bea3..e07c7a3b97ee371830eaa94888145bb0b4b42e11 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2013  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

diff --git a/src/Makefile.am b/src/Makefile.am
index 26cb25f488f7739a8fab59477596a7fbf1782a62..77c1eaf3ff6cfe0980e3742acc1e868f4b224780 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

diff --git a/src/PYHELLO/Makefile.am b/src/PYHELLO/Makefile.am
index 1f65521e8976a5ffe7feda3176e642653102a2a8..a86b1cf5f8789da014edfa269dee703fd38578ff 100755 (executable)
--- a/src/PYHELLO/Makefile.am
+++ b/src/PYHELLO/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/PYHELLO/PYHELLO.py b/src/PYHELLO/PYHELLO.py
index 0b8c81c549383a97f155b761cc26b324924c98d4..aa337db5e6c3fc16d7079a0a319d1ed63bd2fcb4 100644 (file)
--- a/src/PYHELLO/PYHELLO.py
+++ b/src/PYHELLO/PYHELLO.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
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/src/PYHELLO/PYHELLO_utils.py b/src/PYHELLO/PYHELLO_utils.py
index c90954ab7bd979ef594b4d4aad0b38d8cf1b2106..a870a1011f489badbf054161e8fbf233b4bd49d8 100644 (file)
--- a/src/PYHELLO/PYHELLO_utils.py
+++ b/src/PYHELLO/PYHELLO_utils.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/PYHELLOGUI/Makefile.am b/src/PYHELLOGUI/Makefile.am
index f857d5ea28b245e4933343722090bf37482d722d..0e835c9e991cc8a9e8b175a309dbff605ecf454a 100755 (executable)
--- a/src/PYHELLOGUI/Makefile.am
+++ b/src/PYHELLOGUI/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/PYHELLOGUI/PYHELLOGUI.py b/src/PYHELLOGUI/PYHELLOGUI.py
index ab552dc0b4f16d4ada7526a53315bf1a77b7d8e3..853e94177273d42c487ca19b857b57b28c1355fd 100644 (file)
--- a/src/PYHELLOGUI/PYHELLOGUI.py
+++ b/src/PYHELLOGUI/PYHELLOGUI.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
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS