Merge from V6_main 01/04/2013

diff --git a/AUTHORS b/AUTHORS
index 7bdd20e1b09247b8dfe4cebc56ea70b4904cd996..ad238a25be349ce0b9b558a626231f4c7e25313a 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/BLSURFPLUGIN_version.h.in b/BLSURFPLUGIN_version.h.in
index facaf9be244490a28f32d8457f00d444114eed26..e43f1cb602e12c12f67b5049d5f24bda2d2bef66 100644 (file)
--- a/BLSURFPLUGIN_version.h.in
+++ b/BLSURFPLUGIN_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/ChangeLog b/ChangeLog
index edde3d35b4a73d23ea8e100f80f2e3b36f2bb78a..052cab75cff4c5daab5cad66f5ed04fedeeb3da6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/INSTALL b/INSTALL
index 9b0b3a0af2c76ce77675982cf1c1c8cab8e06830..e3756fbb2ac01765a2fb23e414d39d7a7dd224fa 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 d70863f7c9c3a28d315835fe7463f212dfa9dcfb..6082e26be9bf0544d257e119ffd73480f0f6e9a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/NEWS b/NEWS
index d22503a457d5cc6e70b570851d41dd6b4efc6337..d53b4c62beeb94551ec439e647edcf5578cdc8d2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 6b3c7d7a20fa996be12aace8e770fe7b5df1990a..36e883d072bd0f0d2a22a95d4992c8999526b2e6 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
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/cmake_files/FindBLSURF.cmake b/adm_local/cmake_files/FindBLSURF.cmake
index 5fea8526d0732d05fb64b01d28fd78b124b45c8d..81537d23d0eae196b6b7963c0dc3c8d5be68d313 100644 (file)
--- a/adm_local/cmake_files/FindBLSURF.cmake
+++ b/adm_local/cmake_files/FindBLSURF.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/cmake_files/FindCADSURF.cmake b/adm_local/cmake_files/FindCADSURF.cmake
index c567a9a40f484ce6b6a7f4d16786bb4a19217d28..cac4ecbb476c26946b8ae877c4b952c55e2f8e66 100644 (file)
--- a/adm_local/cmake_files/FindCADSURF.cmake
+++ b/adm_local/cmake_files/FindCADSURF.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am
index b21e68d05c3591155d601f0a133480b31d227422..7540d4a5c9ee9a7e5c2bbaf33d6a1dbbc6a14040 100644 (file)
--- a/adm_local/cmake_files/Makefile.am
+++ b/adm_local/cmake_files/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 55a47ce7e41a7f1d271acc0bd06cfd8f39d96c57..dd764d0040d23ccf77a2c01d22a54f239725d441 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
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 01174b37ca796749e72c54f15d323b673501cf63..b0bf67cc2df61e651ae2aa94fc0c9514c1c44d32 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
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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_BLSURF.m4 b/adm_local/unix/config_files/check_BLSURF.m4
index ae7bab81cbd55741e80e34152b3803cb5d72b4bb..4be6ff456e99e77eefbb30fd8c2f4fccabe3083f 100644 (file)
--- a/adm_local/unix/config_files/check_BLSURF.m4
+++ b/adm_local/unix/config_files/check_BLSURF.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+dnl Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 dnl
 dnl This library is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU Lesser General Public

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

diff --git a/adm_local/unix/config_files/check_MESHGEMS_CADSURF.m4 b/adm_local/unix/config_files/check_MESHGEMS_CADSURF.m4
index 2ca3d97c4da389b6b4fe3866a8c7e9e035dd2daf..c4ce3a562c7cbdf135050d2ab3b339295b10509c 100644 (file)
--- a/adm_local/unix/config_files/check_MESHGEMS_CADSURF.m4
+++ b/adm_local/unix/config_files/check_MESHGEMS_CADSURF.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+dnl Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 dnl
 dnl This library is free software; you can redistribute it and/or
 dnl 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 623dfe5a5f596047303a3b56019ba658403f2e02..6a073bf3a6a0a86ebe6830f4a3c3dca69727c083 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
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -62,6 +62,11 @@ docdir             = $(datadir)/doc/salome
 
 # common rules
 
+# ============================================================
+# Cmake files wildcard (to add then to the distribution)
+# ============================================================
+CMAKEFILES         = $(notdir $(wildcard $(srcdir)/CMakeLists.txt))
+
 # meta object implementation files generation (moc)
 %_moc.cxx: %.h
        $(MOC) $< -o $@
@@ -80,7 +85,8 @@ ui_%.h: %.ui
 
 # extra distributed files
 EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \
-             $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts)
+             $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) \
+             $(CMAKEFILES)
 
 # customize clean operation
 mostlyclean-local:

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 24e249a5c3b0700452f4e00dc365ca6f3d0d09b7..51604d551873f1fbdb9e8198907296b9fc5d2393 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 b/build_cmake
index 21a5b49e4f88123d048934e2d796e26bdb7d38c9..66dd1e87c6441ddb3531f2885719978fda9279a6 100755 (executable)
--- a/build_cmake
+++ b/build_cmake
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 27a36241fdada64d8f4bb3ab8ad6842a079fa312..450067ea5037d2e14b2a3c27d32395905ccb39da 100644 (file)
--- a/build_cmake.bat
+++ b/build_cmake.bat
@@ -1,4 +1,4 @@
-@REM Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+@REM Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 @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 1b0e6de99742d3663baaa8c2fc725a3e934b8408..6a4d2c20112a9b32fac982b0fa267b6dcc609d3a 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 d1179266f5fc59220badc18c778700c903d55889..f0d9f4326bb03e480f1e0af8b5bf4129defca168 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 c960cc3fd37377dd02e7ab6ed92b81968abbb074..79a5b34a138cc271de33b655fd353aa23a94cd9f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 7c206a5bdc93daa82fe8573a6f6fdbd19bb79f07..fe3524a0b3c89c150bf7aa6582a787b88a41bf28 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/salome/Makefile.am b/doc/salome/Makefile.am
index f5de046e3ba0efa1f79785355d85be7256df7d43..319d24538bacd9c3d419219a53a21ff61fbe5651 100644 (file)
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/salome/gui/BLSURFPLUGIN/CMakeLists.txt b/doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt
index 0cd2f065633a9f09860532b2364e4056be1d25a2..f6a97187192149d0ae45b635cdd20e007e10a1c1 100755 (executable)
--- a/doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt
+++ b/doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
 #
 # 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/salome/gui/BLSURFPLUGIN/Makefile.am b/doc/salome/gui/BLSURFPLUGIN/Makefile.am
index 2517c0b879f722dbcd508e2b3c5c900f6dab60f0..3d9812dacc5a145eeef569601f3aa19331f8bede 100644 (file)
--- a/doc/salome/gui/BLSURFPLUGIN/Makefile.am
+++ b/doc/salome/gui/BLSURFPLUGIN/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/salome/gui/BLSURFPLUGIN/doxyfile.in b/doc/salome/gui/BLSURFPLUGIN/doxyfile.in
index 1a8f9a5f7464150dbe21666c0e9745a420a6dc80..039b1c3d95f51130f3fcab923981fdb823b7f999 100755 (executable)
--- a/doc/salome/gui/BLSURFPLUGIN/doxyfile.in
+++ b/doc/salome/gui/BLSURFPLUGIN/doxyfile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/salome/gui/BLSURFPLUGIN/doxyfile_py.in b/doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in
index 2c1ad9db3e7cc8cc1cd09039a25379742e1c2fab..097ce1e54cfdde4f4aaf806161706d89113c4be9 100755 (executable)
--- a/doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in
+++ b/doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/salome/gui/BLSURFPLUGIN/static/footer.html b/doc/salome/gui/BLSURFPLUGIN/static/footer.html
index 4c89a2ba1ed1150de49b5f1bc72ca9975f411550..f8f47cefa5f8182b0f4e4d2314d26271997f28f0 100755 (executable)
--- a/doc/salome/gui/BLSURFPLUGIN/static/footer.html
+++ b/doc/salome/gui/BLSURFPLUGIN/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<br>
  </div>
  </div>
 </body>
 </html>
-               
\ No newline at end of file

diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
index fab0fec0d56870e4c2f3d6d3aec157983ec8fcc4..eec32530264ce0b58a19a792d574f2bc58b583c2 100644 (file)
--- a/doc/salome/gui/Makefile.am
+++ b/doc/salome/gui/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index c0aef17029ec9f93cdcf7b4cd78e8f808439d1ad..64684bf47b137d5d3268e44eca03d031ad3a9db3 100644 (file)
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# 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/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index e553b4323eba25c8ac23dfc90addac9939992c40..f01f412a880cdefe0bb94cf4f8d49cced654a563 100755 (executable)
--- a/doc/salome/tui/doxyfile.in
+++ b/doc/salome/tui/doxyfile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# 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/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html
index 29e07ad723e114af246519b7d0a1e251055069bd..20fc8b48487c3eeffceacb87c779689f22acb706 100755 (executable)
--- a/doc/salome/tui/static/footer.html
+++ b/doc/salome/tui/static/footer.html
@@ -4,7 +4,7 @@
 </head>
 <body>
 <hr style="width: 100%; height: 2px;">
-<div style="text-align: center;">Copyright &copy; 2007-2012 CEA DEN, EDF R&amp;D<br>
+<div style="text-align: center;">Copyright &copy; 2007-2013 CEA DEN, EDF R&amp;D<br>
 </div>
 </body>
 </html>

diff --git a/idl/BLSURFPlugin_Algorithm.idl b/idl/BLSURFPlugin_Algorithm.idl
index 1cd1cd9ed42b8e272e2e5b6b54ee399a034bf219..c03c31ca50c200dddc3c7608b7c428b89b3d9d27 100644 (file)
--- a/idl/BLSURFPlugin_Algorithm.idl
+++ b/idl/BLSURFPlugin_Algorithm.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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 e9e3d924323bfabb105bae728c9749d2f58afcc0..e8f8e9c65a112183c4462dc55a8a152c1a46206d 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/BLSURFPlugin.xml b/resources/BLSURFPlugin.xml
index 93cbaf79fc96a1f69ef059b125eef734b84c4a7f..ec9402d2791e38b0080aa1812824e7bc48680d3c 100644 (file)
--- a/resources/BLSURFPlugin.xml
+++ b/resources/BLSURFPlugin.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE meshers PUBLIC "" "desktop.dtd">
 <!--
-  Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+  Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 
   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 12bb18ad58e137649daee123c630cb5d00391aee..4c7f25efed214ce1defda7a0aaaf5667b7508aa1 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 b/resources/SalomeApp.xml
index 72c6a4a3e58ebd523d4bd80897831d68e990c9ad..439586f34f6dffe6989983681f264070225a7d88 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+  Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 
   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/BLSURFPlugin/BLSURFPluginDC.py b/src/BLSURFPlugin/BLSURFPluginDC.py
index c7b55681e8fb8d0db4974bf97dbc4714abf68afd..0ae068df70c8e79b143f8e6c04637dc7c76ae2e0 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPluginDC.py
+++ b/src/BLSURFPlugin/BLSURFPluginDC.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/BLSURFPlugin/BLSURFPlugin_Attractor.cxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
index 57ce59234603f1cd9fbe027b801b1ec6cf50a025..87fa15e4799a1faa9eb282c54779f74f94ca675b 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/BLSURFPlugin_Attractor.hxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx
index 2c8cb8b6de4f09b2406b380552b1d493c174a45a..2caf2b33fdfe1abceb4355af41b52e3113476338 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 21be167b614251e6a334dccae7aed443a54eb2f3..41ce9764803ce4a09cce32fa8084a00446c9ae68 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // ---
 // File    : BLSURFPlugin_BLSURF.cxx

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx
index fd276706227b9cfa5b52cac9759b2a26175a43e8..5ebbd56019fd7d96767b08a272b3e57384c0bc3e 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx
index 68750c7787d44569f8db1a270e4a7c4557b6c8da..f3218d998b9226d3caebc929ef77d45d0f62fc41 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx
index 97885cf2e63aab8412d3ee4ccb8b1d9995469867..8f5e49289ab7bc9bf526ed846eb982c60cf5c725 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
index ab6e14d32167d71615bda00edd92e4b12037c077..172b8988f164a257b448cb565e846494c3aad5f5 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
index 7475444a6bf7c6ad9d1227b17642e6e60a2da22a..885bb90ec2e98266c4411aca5286237fd0deae33 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
index 1cf2944ef02e0d5da61d989f94c3fa8fa9471980..496cf4043c4ae8cc6db2863a543bc0a46f4deca6 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
index 3712beef69e7ca6fef12fc29efbf56426d98f0e9..62cb6570edf6779f6b89b5ac3480f164f0427cb9 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/BLSURFPlugin_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_i.cxx
index 2ca0fa96271b0755f943296159e14a6f62d364ac..3022e163aa22c48406a964fa6e84222c71ab6061 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/BLSURFPlugin/Makefile.am b/src/BLSURFPlugin/Makefile.am
index 6b0ad8863c8bdc6a8a5b2258a5b21ea537bdf6ec..efa0fc4ba75767a5587c08f318f8ef9111676db0 100644 (file)
--- a/src/BLSURFPlugin/Makefile.am
+++ b/src/BLSURFPlugin/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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/GUI/BLSURFPluginGUI.cxx b/src/GUI/BLSURFPluginGUI.cxx
index bb25855f5a17783e947c313c5ca08e289123efb0..efbd62007b5ea716cc3e6fe56ff4f968717c2c67 100755 (executable)
--- a/src/GUI/BLSURFPluginGUI.cxx
+++ b/src/GUI/BLSURFPluginGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/GUI/BLSURFPluginGUI_AdvWidget.cxx b/src/GUI/BLSURFPluginGUI_AdvWidget.cxx
index 314f492337eed2c49437ee8f125d6a7bc6da1b86..bc742d800f3a4fc3c0df01914abf8c9d6a70b58f 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_AdvWidget.cxx
+++ b/src/GUI/BLSURFPluginGUI_AdvWidget.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/GUI/BLSURFPluginGUI_Dlg.h b/src/GUI/BLSURFPluginGUI_Dlg.h
index a8693fe8dffa12211568f6fb3e8a1f3a7c251c51..26307463ddd8b80d23fa463e66bc8471a52ca1fd 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_Dlg.h
+++ b/src/GUI/BLSURFPluginGUI_Dlg.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
 //
 // 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/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index a4db08bb516b2b576f39a30b6488bca5f69ee4fd..a1099f6864f292c49803003bac8f34de0e3f20b5 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
index 717012f0feef2f452a1d9f436203919974f1c28c..d3063737191665bb286bed13269ca0b37cd4e799 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/GUI/BLSURFPluginGUI_StdWidget.cxx b/src/GUI/BLSURFPluginGUI_StdWidget.cxx
index 44d6a9a1780e84aecad3f152edee06d2dec9fabd..d360116770e5cf54b84cb41157afd226ce170e76 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_StdWidget.cxx
+++ b/src/GUI/BLSURFPluginGUI_StdWidget.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 //
 // 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/GUI/Makefile.am b/src/GUI/Makefile.am
index e77ad36eff7523f4fdf09236f8c118a7810ee851..728c424776b4b3d97623e0f881cd9c2453b268c5 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # 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 55f2b5c0acd86fea3d632737a71e7538160b7090..6b79483d3856383b323ba36c8987bd7806af11b9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public