Merge from V6_main 01/04/2013

diff --git a/CALCULATOR_version.h.in b/CALCULATOR_version.h.in
index 8412d9386c6e1375c1b651f4c8a67b76ca683f4a..e14e96b803227a5a269aa12e4f4bfed35f368bb1 100644 (file)
--- a/CALCULATOR_version.h.in
+++ b/CALCULATOR_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 7c9751afb54b50c8ff55da3c209ed3e705d793d1..2436f42e5bbb6afadb97ae94c8e6e018996ebcce 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 76861aaea54304c27023b21e628e6a5285a574bd..98d008f94776ae908292ba2030311e1f1676406e 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_CALCULATOR.m4 b/adm_local/unix/config_files/check_CALCULATOR.m4
index f33d1e867b2d70608750a2e9ec6160883183b5bf..37c63add7ca88879881aa27b28c52d534dea6d6d 100755 (executable)
--- a/adm_local/unix/config_files/check_CALCULATOR.m4
+++ b/adm_local/unix/config_files/check_CALCULATOR.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 3f2293ec8089c90a3bd6f5729b030f4951039dd9..df565460e8b6a69bd382da8159a27605ab07c0cd 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 17f87adb3302b95dffd92bba14dc280a589fa4a6..be8debe8495e52289b4d9a1a0142a0f3ee48d06f 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 6c8e5bc532f62eac18c43f92709374e707ce4167..b313b76fdf368ff3d6d4f96d22d785712e864fc8 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_configure b/build_configure
index e530a2515610453068681d38b5289806c7ea45c0..da02b3fa733a60477a0347a21666121a02edf1a6 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 25c411748cbb7bf77db05480163b591d855095cb..49390513d77b4290cc1c01b97e22950249215de4 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 8115339ac707a24b0b9ded004451e39a12346f36..066a4d7f996ca69abc3f57c344465b16e286afcd 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 8b8a48df3dfcaad3edb8e2761a5890b4b966be60..78573ab472f96f728231642ff71a9e158e0532ef 100644 (file)
--- 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/idl/CALCULATOR_Gen.idl b/idl/CALCULATOR_Gen.idl
index 902f05a96f1a04cb498c6e29b51dceec337038cc..a8ec62e9de26848641ef1e087c4789f3efc2e1d4 100644 (file)
--- a/idl/CALCULATOR_Gen.idl
+++ b/idl/CALCULATOR_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 82902cff76609ff188ec4c53ac795445287ac76a..3d01223af5ccac75b173eb55e7b89d5507707fde 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/CALCULATORCatalog.xml.in b/resources/CALCULATORCatalog.xml.in
index 5e358025b147291b1042bf0dee553a93b53427b2..7c00498d8ecce58147091b4b8dbd1bcb5a3d669a 100644 (file)
--- a/resources/CALCULATORCatalog.xml.in
+++ b/resources/CALCULATORCatalog.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/CALCULATOR_en.xml b/resources/CALCULATOR_en.xml
index 279f30a0a8a7917ea357949dd6643414e47b850a..f31263307cd9fcc01eb5522b1d04b974494dabab 100644 (file)
--- a/resources/CALCULATOR_en.xml
+++ b/resources/CALCULATOR_en.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE application PUBLIC "" "desktop.dtd">
 <!--
-  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/CALCULATOR_fr.xml b/resources/CALCULATOR_fr.xml
index 878529d08c76425439eeb5df3d3678588ec25c51..6a8e4e499561de252f7fa473335ef1648da16e8c 100644 (file)
--- a/resources/CALCULATOR_fr.xml
+++ b/resources/CALCULATOR_fr.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE application PUBLIC "" "desktop.dtd">
 <!--
-  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 3e15737923dc7c1a987d772f9de2dd30a91e0179..60d85add3d6b7dbd5b9c2170807a9a7aac3db475 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 e355402c830e571a632344288e7ed560460d58e1..efc7452c7b62b32061aa2651dc83ff8a45f26979 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/CALCULATOR/CALCULATOR.cxx b/src/CALCULATOR/CALCULATOR.cxx
index e46793d1589707a3f1e79ff9301172892ab6d9b8..a2b5d74b44800c711d6fbc352170d8735cc62816 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.cxx
+++ b/src/CALCULATOR/CALCULATOR.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/CALCULATOR/CALCULATOR.hxx b/src/CALCULATOR/CALCULATOR.hxx
index 9dc8f41b12336d667f979245fddde4aa9331a5a8..4daafc9184372fb10737ad93ea11e1085492fc65 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.hxx
+++ b/src/CALCULATOR/CALCULATOR.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/CALCULATOR/CALCULATOR_TEST.py b/src/CALCULATOR/CALCULATOR_TEST.py
index 8db8a90cd00df40bbb081247f0f34227ec8af432..4506c4ec8e1eddb03ba47f71043ab27bab5d98e3 100644 (file)
--- a/src/CALCULATOR/CALCULATOR_TEST.py
+++ b/src/CALCULATOR/CALCULATOR_TEST.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/CALCULATOR/CALCULATOR_TEST_STUDY_WITHOUTIHM.py b/src/CALCULATOR/CALCULATOR_TEST_STUDY_WITHOUTIHM.py
index 251bfc5e4f840fb143f05da33058df2dee14123f..c33b924da5ee79a286b710cccf56c86b16266fe6 100755 (executable)
--- a/src/CALCULATOR/CALCULATOR_TEST_STUDY_WITHOUTIHM.py
+++ b/src/CALCULATOR/CALCULATOR_TEST_STUDY_WITHOUTIHM.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/CALCULATOR/CALCULATOR_TEST_WITHOUTIHM.py b/src/CALCULATOR/CALCULATOR_TEST_WITHOUTIHM.py
index 29093ebe82c1f46ff9a2a602b6f073ab4748d97d..bb86f8152432c845e794b373f42b4321e8ef57ab 100755 (executable)
--- a/src/CALCULATOR/CALCULATOR_TEST_WITHOUTIHM.py
+++ b/src/CALCULATOR/CALCULATOR_TEST_WITHOUTIHM.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/CALCULATOR/Makefile.am b/src/CALCULATOR/Makefile.am
index 3288dc823bec032d0852b4eb4cc4b3f72170dfc2..1cbedd3f55d1f1829b599b28c72857f7134394d4 100755 (executable)
--- a/src/CALCULATOR/Makefile.am
+++ b/src/CALCULATOR/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/CALCULATOR/graphe1.py b/src/CALCULATOR/graphe1.py
index 2c5e528f524362fa6aecafc36b7c093cb5488c2e..83c90a8b58fab750d5b24d4b2951fbf421012ea1 100644 (file)
--- a/src/CALCULATOR/graphe1.py
+++ b/src/CALCULATOR/graphe1.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/CALCULATOR/graphe1.xml b/src/CALCULATOR/graphe1.xml
index cc209ba485beac117f33ddc5e10a85756dad2cce..d585e35a67e9f754d2d7441cf8b42bbb67bd6924 100644 (file)
--- a/src/CALCULATOR/graphe1.xml
+++ b/src/CALCULATOR/graphe1.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE SuperGraph>
 <!--
-  Copyright (C) 2007-2011  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 ed8fc250e8a6ecb1533f534cb93540972e452176..c43af0ceb4043f612d955979deb3edb2cd5508bb 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