Merge from V6_main 01/04/2013

diff --git a/HELLO_version.h.in b/HELLO_version.h.in
index d4dbfdc7c32d8b06af2e258ab007fb95624570e3..e10c630761eecd0eacbcab54dfcc3f4dc3b76be6 100644 (file)
--- a/HELLO_version.h.in
+++ b/HELLO_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
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/Makefile.am b/Makefile.am
index 3d708d84389dde07bcafe73d8434b410704bf72a..bcc51bcabc79325ad9ce53331114d8596cd795bd 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 2cd4f824e8e1eabf44ef9d1d115baf75791a4987..9ddd80e3b1117b242f9aabf59ffde83b4851e6f8 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_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4
index ef1836958d064a0d9e45d00f25e34154372d91bb..a073c014ba4711fa0033a1a4c61f581f0749d505 100755 (executable)
--- a/adm_local/unix/config_files/check_GUI.m4
+++ b/adm_local/unix/config_files/check_GUI.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/config_files/check_HELLO.m4 b/adm_local/unix/config_files/check_HELLO.m4
index d17f28691bd079b02328315691850e07d61499d0..84886cc9d0eab1409ce4e957012e4e6eebed62e8 100755 (executable)
--- a/adm_local/unix/config_files/check_HELLO.m4
+++ b/adm_local/unix/config_files/check_HELLO.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 2806c8b6d7dd8ed3d74732c5763e17431a36b6b5..67f99d28c350d3a3e4cd8de366b58795b6a6baa1 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 91a8c2cbb083a6f79b7dd310212129fae2c85f8d..41a2646dcb3e170e66a041d52619f7e5bb8bf593 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/bin/test_hello.py b/bin/test_hello.py
index 24e38f38de622c94b4e6b643c7811a6e07899a6b..c9ea724b2bafc4838ca5cb8f6c3b933ef77e0f0f 100755 (executable)
--- a/bin/test_hello.py
+++ b/bin/test_hello.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/build_configure b/build_configure
index 2255b8461c0f3a70d9adab861bedee534ea3f0e1..098b097811b62a443819d34d86f1881b99278b7a 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 867b2d2a07dd68ae8955c855127458597f9891d2..69eede865f96b1f2742862b8cf0bf69aafa9ece9 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 89ec5045864b79dba0475d764fdaf713fae13acd..7e0226d01f4c7d5a306d9816ec39966fbd553868 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 bf1a6b7fb73f2ec92647937e18fbfea33aecc3ed..a0fd47ebb3abf6446d681cbab421bcc00cc80ef6 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/HELLO_Gen.idl b/idl/HELLO_Gen.idl
index 49cfec25701fcccc6af2c9c86f9c656d4a368c20..b8aa19e6b7c519fca3c366a29b447306daa0bb57 100644 (file)
--- a/idl/HELLO_Gen.idl
+++ b/idl/HELLO_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/idl/Makefile.am b/idl/Makefile.am
index 2b818abfcdec791e94124da49b6773114edf327b..84326e9294e9b410e7513fdad9851d9bfa19af9b 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/HELLOCatalog.xml.in b/resources/HELLOCatalog.xml.in
index fbd5378b7355cc9a9d653ecab683651e077394fa..1d9f1dea610e1c88ce78e3af46dd59988fba8306 100644 (file)
--- a/resources/HELLOCatalog.xml.in
+++ b/resources/HELLOCatalog.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/Makefile.am b/resources/Makefile.am
index fd4f412b21a1a5b78f967f69c26eb6368306e72d..3af56a04d4c70cdfb3deb3b6120b06d41499243d 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 61628058df54c97c4bc0cd7619d94c5072b0c9ae..99ee50637922c8c92a5a83a916344d8691d25fb3 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/HELLO/HELLO.cxx b/src/HELLO/HELLO.cxx
index 42de33e49439646573fe9d2d3478239d4674bbff..d400bb1818087792b37d29045d12963e4525dd83 100755 (executable)
--- a/src/HELLO/HELLO.cxx
+++ b/src/HELLO/HELLO.cxx
@@ -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/HELLO/HELLO.hxx b/src/HELLO/HELLO.hxx
index 25d869f58f74eb3adb3bff3359d3ee776f78d2d2..325ec96a54dba79154507542ac600a48a7ff894c 100644 (file)
--- a/src/HELLO/HELLO.hxx
+++ b/src/HELLO/HELLO.hxx
@@ -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/HELLO/Makefile.am b/src/HELLO/Makefile.am
index 5e96bf35bedaa4e918e398e11d35f8159b778096..c908af86621101d535fb48f1e83a0dcb1668dd1a 100755 (executable)
--- a/src/HELLO/Makefile.am
+++ b/src/HELLO/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/HELLOGUI/HELLOGUI.cxx b/src/HELLOGUI/HELLOGUI.cxx
index f602fe75f11bb5761fbe26a0bf181dfd410cf589..ae0d83a7f7fb13b31d1527bf4184b240fd437d9d 100644 (file)
--- a/src/HELLOGUI/HELLOGUI.cxx
+++ b/src/HELLOGUI/HELLOGUI.cxx
@@ -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/HELLOGUI/HELLOGUI.h b/src/HELLOGUI/HELLOGUI.h
index 45f2699781134945cbe091f9851c1f45592c128d..f6dcc7ba0128b78822224600b2419ce0737766d3 100644 (file)
--- a/src/HELLOGUI/HELLOGUI.h
+++ b/src/HELLOGUI/HELLOGUI.h
@@ -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/HELLOGUI/Makefile.am b/src/HELLOGUI/Makefile.am
index 3e1cf038243da54542cb4323abf273e8f8de8081..2dc76061f0b44a2122ec103ba228735a5bdeda5b 100644 (file)
--- a/src/HELLOGUI/Makefile.am
+++ b/src/HELLOGUI/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 412a4999ed0dea05b4ae711000857df07cb74346..6a7cba7df14ef524c84802314f5589f83bf75887 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