Merge from V6_main 01/04/2013

diff --git a/Makefile.am b/Makefile.am
index c887e3f829049290e692033da195daf4c0b1d1b6..9893076e7a837c23965d5a250e256128b88a51e5 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/SMESH_version.h.in b/SMESH_version.h.in
index 76a669881fd5d10f1df6b9be2a729a5dbd2551a2..fff2375112d24d2eb68a3c09cffb1786f52e227e 100644 (file)
--- a/SMESH_version.h.in
+++ b/SMESH_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/adm_local/Makefile.am b/adm_local/Makefile.am
index 6d9ac170cb4ecbcbc520e14fdcef90a20c6f8245..e642b988c54e3e2240d2babe8746b6282452f40a 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/cmake_files/FindSMESH.cmake b/adm_local/cmake_files/FindSMESH.cmake
index b47fb65dc77b69f1dc3d8d665a24a49970071d07..e764afe5b6512618d5d037f3ae67bdbe140f36ed 100644 (file)
--- a/adm_local/cmake_files/FindSMESH.cmake
+++ b/adm_local/cmake_files/FindSMESH.cmake
@@ -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/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am
index 59484d20fa5c9bc63acc5d569b4bfa1023343aad..7f0c58afee2b889b3ff3bb35c295f4ffad52bae8 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, 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 938083baab23366e68418ae6e9a5f71d854fc060..b62b0cd53c658251d09bf03a8050f6ebef459b68 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_Platform.m4 b/adm_local/unix/config_files/check_Platform.m4
index 93c7267e7cfba358478b2a7ac686bceb63472e51..21c2baca91988a3c9db30f5b3aa9af80d37c6604 100755 (executable)
--- a/adm_local/unix/config_files/check_Platform.m4
+++ b/adm_local/unix/config_files/check_Platform.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_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4
index 9096571c19c7b4402fcd2070f22af4b7bf12a7fb..b8290a22ef6500ca349ea926ad72780e62f205d8 100644 (file)
--- a/adm_local/unix/config_files/check_SMESH.m4
+++ b/adm_local/unix/config_files/check_SMESH.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_cgal.m4 b/adm_local/unix/config_files/check_cgal.m4
index 2ec433615b2ac7160fdd059233696c2257f624af..c987b5e3841125e1eb6bec7f6d7c2934e10ba320 100644 (file)
--- a/adm_local/unix/config_files/check_cgal.m4
+++ b/adm_local/unix/config_files/check_cgal.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_cgns.m4 b/adm_local/unix/config_files/check_cgns.m4
index 4e25e27c6e5c0ebe774a0c3009cb13764c49cf2e..008301d7e75ba34db9fa1707a56bca783772683b 100644 (file)
--- a/adm_local/unix/config_files/check_cgns.m4
+++ b/adm_local/unix/config_files/check_cgns.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_f77.m4 b/adm_local/unix/config_files/check_f77.m4
index 64d3288ab370ed04abec6330a5d90eb4fc6b506d..74fdfa501bfb8ed7b52976800ec58d7e8cb6f25d 100644 (file)
--- a/adm_local/unix/config_files/check_f77.m4
+++ b/adm_local/unix/config_files/check_f77.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_padder.m4 b/adm_local/unix/config_files/check_padder.m4
index ab30fecab2aee2dfa5e841c985d87d0645f5c971..2adb6407b9c9cd72a45fb7a516a8ddb1b2d0f3fb 100644 (file)
--- a/adm_local/unix/config_files/check_padder.m4
+++ b/adm_local/unix/config_files/check_padder.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_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4
index b15142068317a096ed9ab191ae5de4b8b4283f1b..1d9ea498ffad05956966a2c5a90abfb352d2a6c0 100644 (file)
--- a/adm_local/unix/config_files/check_qwt.m4
+++ b/adm_local/unix/config_files/check_qwt.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 295f19f813747e09386e7c32a4fa9b0e63df04e5..c5c0f0595cc0755eb900e039f726d017ea52bc0e 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
@@ -64,6 +64,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 $@
@@ -82,7 +87,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 7e1eea667b021ba653ebb0caf01ab1f4c9c1f49e..449725b4e74c12d7220aabe90a274921730c4c6e 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/smesh_setenv.py b/bin/smesh_setenv.py
index a58406c1e78783e067c3b3c0f1ae169dd404de59..aa78a39f511df3dd5a7fe4ee57db92ed8243c603 100644 (file)
--- a/bin/smesh_setenv.py
+++ b/bin/smesh_setenv.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #  -*- coding: iso-8859-1 -*-
-# 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 b/build_cmake
index 30eeb733d64dfb8f1749b9ed979919dc99028f5f..04e35220f3cf83741c47fc5a2bf86234db969e46 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 38e8e726bbfc65ce3b92a008e2b70121730523e7..692a22690155946eba78ee149ab72140e62388fb 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 ce47d8056c03ace9f77680f648ab57de826e1eac..6c9778d7c480cf68deccd511dc72079f09a4fb6f 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 09bfbd7bdd7186dcf1dc8529f4e19fd2942dc4b3..8cc92efc0678d703f4ca8c77f557f6c06c870b20 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 303d5b812bd04b652ccbda465b04ba0326493410..51b8f4504f538d181afffbd88646a7bab013a317 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 6d2dfb20181319a15b9c05ef0ca3ae9bd73086ed..1f5027b11a4ca55c636db1865952143f00157b86 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/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 1775115eea1b743c8adafd21b1013e2baedb4249..0de1c9d7fb7a82ac4cc08c9f1351b09cdcf3160b 100644 (file)
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# 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/salome/Makefile.am b/doc/salome/Makefile.am
index 10bcc3f2528a8488e8c94a6ccb5fc4aad204b46b..ad542920bc1ec8ed6464062216cafe13f6d529bf 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, 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/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt
index 1a1c79544829b4288f5938cb9fd0f6966e522e03..25a067cc449d53bd85bad929c8a6f48860d8a3d9 100644 (file)
--- a/doc/salome/examples/CMakeLists.txt
+++ b/doc/salome/examples/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, 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/examples/Makefile.am b/doc/salome/examples/Makefile.am
index f756654dd60d0658530a0362185e57a6a4689299..94c233a75455c8c62e9fd1bdfc53f0c86f2f493f 100644 (file)
--- a/doc/salome/examples/Makefile.am
+++ b/doc/salome/examples/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/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
index 9582cd97e7765ffcaa7ec9f87752bdad21b61571..6d83072e213fdda71814d6e77c4864bf2de1288a 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, 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/salome/gui/SMESH/CMakeLists.txt b/doc/salome/gui/SMESH/CMakeLists.txt
index 2f4f8b28065f31e5bb4aed0befd5b852426b654e..1d484199e69be4523ea233561e2577b96c268b64 100644 (file)
--- a/doc/salome/gui/SMESH/CMakeLists.txt
+++ b/doc/salome/gui/SMESH/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, 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/gui/SMESH/Makefile.am b/doc/salome/gui/SMESH/Makefile.am
index 5b3adb2fbcf76e9c9430128cb6e0f7d3f6881fbb..abf0ce26f4ab501aba9339e46bbc29502b73686d 100755 (executable)
--- a/doc/salome/gui/SMESH/Makefile.am
+++ b/doc/salome/gui/SMESH/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/salome/gui/SMESH/collect_mesh_methods.py b/doc/salome/gui/SMESH/collect_mesh_methods.py
index 24fd31880739affeb4c7188241337096c1ec80f4..a50e8e458fc61b5d4532469661a4d8ef153eae49 100755 (executable)
--- a/doc/salome/gui/SMESH/collect_mesh_methods.py
+++ b/doc/salome/gui/SMESH/collect_mesh_methods.py
@@ -1,4 +1,24 @@
 #!/usr/bin/env python
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2012-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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# 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:   collect_mesh_methods.py

diff --git a/doc/salome/gui/SMESH/doxyfile.in b/doc/salome/gui/SMESH/doxyfile.in
index 6b27a0c76d5b015389cb414a9f43a4cf5443a6bf..6905d92db491e9882d71b8224ee9558e09d6971f 100755 (executable)
--- a/doc/salome/gui/SMESH/doxyfile.in
+++ b/doc/salome/gui/SMESH/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/salome/gui/SMESH/doxyfile_py.in b/doc/salome/gui/SMESH/doxyfile_py.in
index da25d092b2ea65ee3521a584baeee0df72d6b7ab..381ed77b386080dacabe382341e881527104667e 100755 (executable)
--- a/doc/salome/gui/SMESH/doxyfile_py.in
+++ b/doc/salome/gui/SMESH/doxyfile_py.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/salome/gui/SMESH/input/adding_nodes_and_elements.doc b/doc/salome/gui/SMESH/input/adding_nodes_and_elements.doc
index 7f4ff562e03dc93f7ee3014bae06a0ee5332f2eb..38fb8c590720ca5ff38952b63e39e09fd27d2b73 100644 (file)
--- a/doc/salome/gui/SMESH/input/adding_nodes_and_elements.doc
+++ b/doc/salome/gui/SMESH/input/adding_nodes_and_elements.doc
@@ -19,14 +19,20 @@
 <li>\ref adding_polyhedrons_anchor "Polyhedrons"</li>
 </ul>
 
+SALOME uses the convention of nodal connectivity of elements of MED library. You
+can consult description of the nodal connectivity of elements located
+within documentation on MED library or 
+<a href="http://www.code-aster.org/outils/med/html/connectivites.html">
+  here </a>.
+
 <em>To add a node or an element to your mesh:</em>
 <ol>
-<li>Select your mesh in the Object Browser or in the 3D viewer.</li>
+  <li>Select your mesh in the Object Browser or in the 3D viewer.</li>
 
-<li>From the \b Modification menu choose the \b Add item, the
-following associated sub-menu will appear:</li>
+  <li>From the \b Modification menu choose the \b Add item, the
+    following associated sub-menu will appear:</li>
 
-\image html image146.png
+  \image html image146.png
 
 From this sub-menu select the type of element which you would like to add to your mesh.
 

diff --git a/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc b/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc
index 7f2cf5cf96b708eba8956a5efc738a5d5a32e0f7..1d51daa9a531d25f5d1a29a808b66a4f9d15ca08 100644 (file)
--- a/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc
+++ b/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc
@@ -14,6 +14,12 @@ QUAD9). The quadratic hexahedral element can bear 7 additional nodes:
 at the element center and at centers of sides, then it is referred as
 tri-quadratic one (or HEXA27).
 
+SALOME uses the convention of nodal connectivity of elements of MED library. You
+can consult description of the nodal connectivity of elements located
+within documentation on MED library or 
+<a href="http://www.code-aster.org/outils/med/html/connectivites.html">
+  here </a>.
+
 There are several ways you can create quadratic elements in your mesh:
 - manually create quadratic elements (the way described below);
 - use \ref quadratic_mesh_anchor "Quadratic Mesh" hypothesis to

diff --git a/doc/salome/gui/SMESH/input/constructing_meshes.doc b/doc/salome/gui/SMESH/input/constructing_meshes.doc
index bef709906ca7c7c817eb3d57a1e4b992ed4af6b0..af5cd24e736583573dc7515c79f5586216beb1c6 100644 (file)
--- a/doc/salome/gui/SMESH/input/constructing_meshes.doc
+++ b/doc/salome/gui/SMESH/input/constructing_meshes.doc
@@ -5,9 +5,9 @@
 \n Construction of a mesh on some geometry consists of:
 <ul>
   <li> \ref create_mesh_anchor "Creating of a mesh object"</li>
-  <li> \ref evaluate_anchor "Evaluating mesh size"</li>
-  <li> \ref preview_anchor "Previewing the mesh"</li>
-  <li> \ref submesh_order_anchor "Changing submesh priority"</li>
+  <li> \ref evaluate_anchor "Evaluating mesh size" (optional)</li>
+  <li> \ref preview_anchor "Previewing the mesh" (optional)</li>
+  <li> \ref submesh_order_anchor "Changing sub-mesh priority" (optional)</li>
   <li> \ref compute_anchor "Computing the mesh"</li>
 </ul>
 Mesh can be \ref use_existing_anchor "computed using your own meshing algorithms" 
@@ -172,9 +172,9 @@ These elements can be kept in the mesh.
 
 
 \anchor submesh_order_anchor
-<h2>Changing submesh priority</h2>
+<h2>Changing sub-mesh priority</h2>
 
-If the mesh contains concurrent \ref constructing_submeshes_page "submeshes", 
+If the mesh contains concurrent \ref constructing_submeshes_page "sub-meshes", 
 it is possible to change the priority of their computation, i.e. to
 change the priority of applying algorithms to the shared sub-shapes of
 the Mesh shape.

diff --git a/doc/salome/gui/SMESH/static/footer.html b/doc/salome/gui/SMESH/static/footer.html
index 4c89a2ba1ed1150de49b5f1bc72ca9975f411550..f89cfbbeca2fcc6b44b7434ec9eda3d458b036e1 100755 (executable)
--- a/doc/salome/gui/SMESH/static/footer.html
+++ b/doc/salome/gui/SMESH/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/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index 987d26a43615ea2d85187e6e40b642ac3c4f5c64..41d793a6633d2e6d942ad3fbe85899d8fc9d12a9 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, 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/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index a4143bfee410f5b29192269677fa0247a8b1f1de..0cb55fd6942d2144b8f9a0d4b1ccd5f3fb363147 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, 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
@@ -117,8 +117,8 @@ FILTER_SOURCE_FILES    = YES
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = YES
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 REFERENCED_BY_RELATION = YES
 REFERENCES_RELATION    = YES

diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html
index 5b030c0214278fc821e3965b3c7d23de85f9c743..3dac8ee89dd5a4a51369c7a5875005b02b7068cb 100755 (executable)
--- a/doc/salome/tui/static/footer.html
+++ b/doc/salome/tui/static/footer.html
@@ -6,8 +6,7 @@
 <div class="footer1">
 <!--hr style="width: 100%; height: 2px;"-->
 <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>

diff --git a/idl/Makefile.am b/idl/Makefile.am
index c43e554d320152261567f789ab048e7e5656cad0..c43c430ee81bf1b5af321d08d3804d327780e494 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/SMESH_BasicHypothesis.idl b/idl/SMESH_BasicHypothesis.idl
index 2a08129a09785be9c8e2836ab4bf8e8b17d69217..312f173720a2875e75fee2bc97864e4cec151ab6 100644 (file)
--- a/idl/SMESH_BasicHypothesis.idl
+++ b/idl/SMESH_BasicHypothesis.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/SMESH_Filter.idl b/idl/SMESH_Filter.idl
index b516d19eb223eda35e040aa274fd402784b6a643..3355bbe48a215601dfdc0db1a6ff84e30e921dd8 100644 (file)
--- a/idl/SMESH_Filter.idl
+++ b/idl/SMESH_Filter.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/SMESH_Gen.idl b/idl/SMESH_Gen.idl
index 8385a9030eb75a5095e8a3f1451c1b269b1b41b0..28286ef57ace35248dce15185752dc883e10ad74 100644 (file)
--- a/idl/SMESH_Gen.idl
+++ b/idl/SMESH_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/SMESH_Group.idl b/idl/SMESH_Group.idl
index d00fe0e9d4296b8b1101cf641ff4bc48b2eb852b..b648e75f3282ce85c0cbacba6cedc8fde7e44c8a 100644 (file)
--- a/idl/SMESH_Group.idl
+++ b/idl/SMESH_Group.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/SMESH_Hypothesis.idl b/idl/SMESH_Hypothesis.idl
index f2e43788e0ff0ab97dd789704f3cc6c6f7be50cd..55848758c756c82918aeca456e20a4f343e1b2fe 100644 (file)
--- a/idl/SMESH_Hypothesis.idl
+++ b/idl/SMESH_Hypothesis.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
@@ -76,33 +76,12 @@ module SMESH
     string GetVarParameter (in string methodName);
 
     /*!
-     *  Set list of parameters
-     *  \param theParameters is a string containing the notebook variables separated by ":" symbol,
-     *         used for Hypothesis creation
+     * \brief Store a hypothesis wrapping this not published one.
+     *
+     * This hyp, which has no own parameters but is published, is used to store variables
+     * defining parameters of this hypothesis.
      */
-    // void SetParameters (in string theParameters);
-
-    // /*!
-    //  *  Return list of notebook variables used for Hypothesis creation separated by ":" symbol
-    //  */
-    // string GetParameters();
-
-    // /*!
-    //  *  Return list of last notebook variables used for Hypothesis creation.
-    //  */
-    // ListOfParameters GetLastParameters();
-
-    // /*!
-    //  *  Set list of parameters
-    //  *  \param theParameters is a string containing the last notebook variables separated by ":" symbol,
-    //  *         used for Hypothesis creation
-    //  */
-    // void SetLastParameters(in string theParameters);
-    
-    // /*!
-    //  * Clear parameters list
-    //  */
-    // void ClearParameters();
+    void SetHolderHypothesis(in SMESH::SMESH_Hypothesis hyp);
 
     /*!
      * Verify whether hypothesis supports given entity type 

diff --git a/idl/SMESH_Measurements.idl b/idl/SMESH_Measurements.idl
index 6d8d7f54584ff55d39efa141bd080876023801ef..becc67547d64e4d0e1f69bc439201e387a9e1a0c 100644 (file)
--- a/idl/SMESH_Measurements.idl
+++ b/idl/SMESH_Measurements.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/SMESH_Mesh.idl b/idl/SMESH_Mesh.idl
index 33c775e38b96e36bd1f80cc43836185bb22d0275..a8d82f7d2f8030ce7f8f95de914858834662eafa 100644 (file)
--- a/idl/SMESH_Mesh.idl
+++ b/idl/SMESH_Mesh.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/SMESH_MeshEditor.idl b/idl/SMESH_MeshEditor.idl
index 956e871c8a66b756c1b42a1b97cb86af858e2a4f..f1b2fc82b86d3a86b7919cc81e11e8b86e6e7d38 100644 (file)
--- a/idl/SMESH_MeshEditor.idl
+++ b/idl/SMESH_MeshEditor.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/SMESH_Pattern.idl b/idl/SMESH_Pattern.idl
index 85b842f8374f1053913e96a2deb8e9f9ece4f7ed..0d90e8ae58143f4c17c55076193574a10541ac5b 100644 (file)
--- a/idl/SMESH_Pattern.idl
+++ b/idl/SMESH_Pattern.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 4cb55e8103b76d619cb8470832c3c1a61ae29cd1..851cb385298152bee43ca99ac66ecb7d5d7b6569 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/SMESHCatalog.xml.in b/resources/SMESHCatalog.xml.in
index f658219171aef5bcd7853170045d2d9b3d779d6d..4b5e1a80b11d17a73b488168c6d28ccca0bb33af 100644 (file)
--- a/resources/SMESHCatalog.xml.in
+++ b/resources/SMESHCatalog.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 efad182dbf62aa75299a5230af682d15a157772f..fca22ab93ff70bf4247f81a2b652186b91b15b4e 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
@@ -28,12 +28,14 @@
     <parameter name="icon" value="ModuleMesh.png"/>
     <parameter name="version" value="@VERSION@"/>
     <!-- Other module preferences -->
+    <parameter name="use_precision"                value="false" />
+    <parameter name="renumbering"                  value="false" />
     <parameter name="default_grp_color"            value="255, 170, 0"/>
     <parameter name="node_color"                   value="255, 0,   0"/>
-    <parameter name="fill_color"                   value="0, 170, 255|-100"/>
+    <parameter name="fill_color"                   value="#00aaff|100"/>
     <parameter name="volume_color"                 value="255, 0, 170|-100"/>
     <parameter name="wireframe_color"              value="0, 170, 255"/>
-    <parameter name="outline_color"                value="0,  70,   0"/>
+    <parameter name="outline_color"                value="#004600"/>
     <parameter name="elem0d_color"                 value="0, 255,   0"/>
     <parameter name="ball_elem_color"              value="0, 85,   255"/>
     <parameter name="highlight_color"              value="0, 255, 255"/>
@@ -88,12 +90,12 @@
     <parameter name="info_dump_add"                value="true" />
     <parameter name="segmentation"                 value="10"/>
     <parameter name="nb_segments_per_edge"         value="15"/>
-    <parameter name="forget_mesh_on_hyp_modif"     value="false"/>
+    <parameter name="forget_mesh_on_hyp_modif"     value="true"/>
     <parameter name="quadratic_mode"               value="0"/>
     <parameter name="max_angle"                    value="2"/>
     <parameter name="documentation"                value="smesh_help"/>
     <parameter name="preview_actor_chunk_size"     value="100" />
-    <parameter name="historical_python_dump"       value="true" />
+    <parameter name="historical_python_dump"       value="false" />
     <parameter name="numbering_node_color"         value="255, 255, 255" />
     <parameter name="numbering_node_font"          value="Times,Bold,10" />
     <parameter name="numbering_elem_color"         value="0, 255, 0" />

diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml
index 59f62042116e21e6a38ee96dfb68f6f7ed168838..af3dd63aab9558cc00cf5897adad06e070087225 100644 (file)
--- a/resources/StdMeshers.xml
+++ b/resources/StdMeshers.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, 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/Controls/Makefile.am b/src/Controls/Makefile.am
index ea7904a61283431c9950adb06083fc84d3668ac4..85ea9f18d6547138e077f71bfd29905023a94614 100644 (file)
--- a/src/Controls/Makefile.am
+++ b/src/Controls/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/Controls/SMESHControls.cxx b/src/Controls/SMESHControls.cxx
index a1fb1f92f47c3162ccf1a057ab5e5b06779ef0d2..ff1477f7554ea6a1750afd0e17027a7da717fcb2 100644 (file)
--- a/src/Controls/SMESHControls.cxx
+++ b/src/Controls/SMESHControls.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/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx
index 0e6cc8cec46f7c74ddfd2af949a857c2a6d400f5..83981ac6195712c469b38fe7801c6f0af8076253 100644 (file)
--- a/src/Controls/SMESH_Controls.cxx
+++ b/src/Controls/SMESH_Controls.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
@@ -18,6 +18,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
+//
 
 #include "SMESH_ControlsDef.hxx"
 

diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx
index 972cb042ac4b99a55cad06ab7f22ac28dc48455d..a6d9d85962416d4d2cf7d42154de50ac063cbdd2 100644 (file)
--- a/src/Controls/SMESH_ControlsDef.hxx
+++ b/src/Controls/SMESH_ControlsDef.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/Driver/Driver_Document.cxx b/src/Driver/Driver_Document.cxx
index a47997532997e21c3a86e88e5c1c8600bc2d1a1d..8ed72929a415d788c98ee12a984366a0b242aff0 100644 (file)
--- a/src/Driver/Driver_Document.cxx
+++ b/src/Driver/Driver_Document.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/Driver/Driver_Document.h b/src/Driver/Driver_Document.h
index 7fc8e60d6537298f4533191f8b4cd73de0af021c..6953f6dd590f735e1e2d55f9259997ba0b158264 100644 (file)
--- a/src/Driver/Driver_Document.h
+++ b/src/Driver/Driver_Document.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/Driver/Driver_Mesh.cxx b/src/Driver/Driver_Mesh.cxx
index c04008f9477f5ea7053e4655182fa2cc972f1107..05acfa63121c4c6bfe8c3560c405b45c8eef9d96 100644 (file)
--- a/src/Driver/Driver_Mesh.cxx
+++ b/src/Driver/Driver_Mesh.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/Driver/Driver_Mesh.h b/src/Driver/Driver_Mesh.h
index a3629e497b86fae606efa71b07d221dafb10c329..21170efca6c18c4a1e83f7ece2849c62168ff3d2 100644 (file)
--- a/src/Driver/Driver_Mesh.h
+++ b/src/Driver/Driver_Mesh.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/Driver/Driver_SMDS_Mesh.cxx b/src/Driver/Driver_SMDS_Mesh.cxx
index 398d422914f946269b6804d74001d783b0b0ddd2..93dfd091cf235962fea10b23577423efea9c3da1 100644 (file)
--- a/src/Driver/Driver_SMDS_Mesh.cxx
+++ b/src/Driver/Driver_SMDS_Mesh.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/Driver/Driver_SMDS_Mesh.h b/src/Driver/Driver_SMDS_Mesh.h
index bb47cb5f1f118e3c79ed2aee6c19982d84b5929f..b79fb05bc1db147c57400f9fa9a9d111497d896b 100644 (file)
--- a/src/Driver/Driver_SMDS_Mesh.h
+++ b/src/Driver/Driver_SMDS_Mesh.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/Driver/Driver_SMESHDS_Mesh.cxx b/src/Driver/Driver_SMESHDS_Mesh.cxx
index 5cebe47ead766f5636a51b52d568d15bd3744c4c..902b5c7e774e49effcf9dc28fadf362df24f92e0 100644 (file)
--- a/src/Driver/Driver_SMESHDS_Mesh.cxx
+++ b/src/Driver/Driver_SMESHDS_Mesh.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/Driver/Driver_SMESHDS_Mesh.h b/src/Driver/Driver_SMESHDS_Mesh.h
index 4e21098ff6d267d76e5bfa6ff5270a558527c064..6e5a2892595fd4e0348a854761190fe1381b6636 100644 (file)
--- a/src/Driver/Driver_SMESHDS_Mesh.h
+++ b/src/Driver/Driver_SMESHDS_Mesh.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/Driver/Makefile.am b/src/Driver/Makefile.am
index a088c773a75ecab364db7bf60599330b27134e3c..5327e2483bef62ba2351fb11620a78819be29408 100644 (file)
--- a/src/Driver/Makefile.am
+++ b/src/Driver/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/DriverCGNS/DriverCGNS_Read.cxx b/src/DriverCGNS/DriverCGNS_Read.cxx
index 97fafe3b1962fb60d3204b83318978cf0b81200a..492c1eb62a75ca2162673a512d8f5e9c22ed8cf2 100644 (file)
--- a/src/DriverCGNS/DriverCGNS_Read.cxx
+++ b/src/DriverCGNS/DriverCGNS_Read.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/DriverCGNS/DriverCGNS_Read.hxx b/src/DriverCGNS/DriverCGNS_Read.hxx
index 6460590f1a4122c6e9d63c561ac1db95e1a446e1..98180fa3fc8c44bea14a0f13f4f4c4423f72fe56 100644 (file)
--- a/src/DriverCGNS/DriverCGNS_Read.hxx
+++ b/src/DriverCGNS/DriverCGNS_Read.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/DriverCGNS/DriverCGNS_Write.cxx b/src/DriverCGNS/DriverCGNS_Write.cxx
index edc474163b16f1616b63caf4a6502ab4990054e6..44033075402e8553c464b8c4c4d53611fadee0f9 100644 (file)
--- a/src/DriverCGNS/DriverCGNS_Write.cxx
+++ b/src/DriverCGNS/DriverCGNS_Write.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/DriverCGNS/DriverCGNS_Write.hxx b/src/DriverCGNS/DriverCGNS_Write.hxx
index 65496ab1f5ebfa734f1ab5d22030db58b517b088..1b75e98a6a75fc08602ecabc5a53b7217a44ae5f 100644 (file)
--- a/src/DriverCGNS/DriverCGNS_Write.hxx
+++ b/src/DriverCGNS/DriverCGNS_Write.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/DriverCGNS/Makefile.am b/src/DriverCGNS/Makefile.am
index 37f1f5de94c62f01c412373a9cd137c53d766383..4fb05669a9b279cca19fdc1978cb7373da3a734b 100644 (file)
--- a/src/DriverCGNS/Makefile.am
+++ b/src/DriverCGNS/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/DriverCGNS/SMESH_DriverCGNS.hxx b/src/DriverCGNS/SMESH_DriverCGNS.hxx
index 365007b8ebba0b21282713a4199978d2434f120f..421e5a098d649a20597a85cb9e766f10138304e5 100755 (executable)
--- a/src/DriverCGNS/SMESH_DriverCGNS.hxx
+++ b/src/DriverCGNS/SMESH_DriverCGNS.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/DriverDAT/DAT_Test.cxx b/src/DriverDAT/DAT_Test.cxx
index 4810067ce9916d13fab85f755c17f90dd34b88f2..0027f356585c7569d0f671d5244e9552c9b4ed97 100644 (file)
--- a/src/DriverDAT/DAT_Test.cxx
+++ b/src/DriverDAT/DAT_Test.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/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
index d44951e8689d9f90d59042fea28eef73a00485fe..2699d12abbc20568d5d48a9bbf6dc21af104cc4b 100644 (file)
--- a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.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/DriverDAT/DriverDAT_R_SMDS_Mesh.h b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.h
index 73169a273c5ed71e20704214dc3b472a74b675c4..ccef96882136fa89ce767b94384372383b9b0839 100644 (file)
--- a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.h
+++ b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.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/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
index 7bdee747b818c6a6d61d4dd4df44f09d1d289ee7..0377139c26ba3ca3c1e83bd3caf94c753b853f3f 100644 (file)
--- a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.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/DriverDAT/DriverDAT_W_SMDS_Mesh.h b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.h
index 66b726b1367f43277a81b312331e154e5b90c851..3ace5253e067b65291b0f0b47619df16085542aa 100644 (file)
--- a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.h
+++ b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.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/DriverDAT/Makefile.am b/src/DriverDAT/Makefile.am
index 232551eb34eef1f14ff3e533c101be981f04d809..8eb6ba0b66233eea9983f7f7d9ebea29720252e1 100644 (file)
--- a/src/DriverDAT/Makefile.am
+++ b/src/DriverDAT/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/DriverDAT/SMESH_DriverDAT.hxx b/src/DriverDAT/SMESH_DriverDAT.hxx
index de4d07ce2c799ea04623be3be52db70379d11ccc..bdb65b5509f75462e3726e58e4ec9138ba9a2424 100755 (executable)
--- a/src/DriverDAT/SMESH_DriverDAT.hxx
+++ b/src/DriverDAT/SMESH_DriverDAT.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/DriverGMF/DriverGMF.cxx b/src/DriverGMF/DriverGMF.cxx
index 17ebb5e057323380f68c587f2682dd23f4ab9e0a..8e70afe829c31579c61b08319f71663ae696232d 100644 (file)
--- a/src/DriverGMF/DriverGMF.cxx
+++ b/src/DriverGMF/DriverGMF.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/DriverGMF/DriverGMF.hxx b/src/DriverGMF/DriverGMF.hxx
index 52d560f06c01b57007eb42d9b9cf7b05ba457b1c..33d6192494aa19e2d5983cda8242517cfee940f6 100644 (file)
--- a/src/DriverGMF/DriverGMF.hxx
+++ b/src/DriverGMF/DriverGMF.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/DriverGMF/DriverGMF_Read.cxx b/src/DriverGMF/DriverGMF_Read.cxx
index 0d70c8d5aeea181d2218c555e43e0a7036cf33b0..7439b37a6cc55c5a6c531ab2666b28a3dd1c3f60 100644 (file)
--- a/src/DriverGMF/DriverGMF_Read.cxx
+++ b/src/DriverGMF/DriverGMF_Read.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
@@ -14,7 +14,7 @@
 // Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, Read to the Free Software
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com

diff --git a/src/DriverGMF/DriverGMF_Read.hxx b/src/DriverGMF/DriverGMF_Read.hxx
index 36226934e084be65487faf32a54ca6a53e4d61f2..bc4ce70d7134b312e5210a63f5a70b22c57a0e1c 100644 (file)
--- a/src/DriverGMF/DriverGMF_Read.hxx
+++ b/src/DriverGMF/DriverGMF_Read.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
@@ -14,7 +14,7 @@
 // Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, Read to the Free Software
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com

diff --git a/src/DriverGMF/DriverGMF_Write.cxx b/src/DriverGMF/DriverGMF_Write.cxx
index 0a3c5ca683972dd79eb23f5f5ebd8c5d547ce70d..c0542620ee6cdcc8665e9efe4a7a45722ed91977 100644 (file)
--- a/src/DriverGMF/DriverGMF_Write.cxx
+++ b/src/DriverGMF/DriverGMF_Write.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/DriverGMF/DriverGMF_Write.hxx b/src/DriverGMF/DriverGMF_Write.hxx
index b66b3d946ba7f759cfa656d7df28fb03c6d16c49..96c7df16e771e6790dca2fb2fce252017f6630da 100644 (file)
--- a/src/DriverGMF/DriverGMF_Write.hxx
+++ b/src/DriverGMF/DriverGMF_Write.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/DriverGMF/Makefile.am b/src/DriverGMF/Makefile.am
index d2aa333621b5fd7c8e46ed351273e19f651750fe..96eb5ac9dc8450b44c4e189d9dc4e780222939a5 100644 (file)
--- a/src/DriverGMF/Makefile.am
+++ b/src/DriverGMF/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/DriverGMF/SMESH_DriverGMF.hxx b/src/DriverGMF/SMESH_DriverGMF.hxx
index dd901a3a23c9aafbfaf79912ebb969757aa5d88c..73dc06dfbf30912310061f170958f92f3e434d2d 100755 (executable)
--- a/src/DriverGMF/SMESH_DriverGMF.hxx
+++ b/src/DriverGMF/SMESH_DriverGMF.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/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx
index 4d9a984d6aef9d8ebc3bad6b7482920ee57477fd..0644c172863a1bca2a9e993118cbdeb4a1d2bc9c 100644 (file)
--- a/src/DriverMED/DriverMED_Family.cxx
+++ b/src/DriverMED/DriverMED_Family.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/DriverMED/DriverMED_Family.h b/src/DriverMED/DriverMED_Family.h
index 1e159539cc9bc7dc77a0698c0697386269805976..1cd35e27194c7ee6b4c761872425b28234bd837e 100644 (file)
--- a/src/DriverMED/DriverMED_Family.h
+++ b/src/DriverMED/DriverMED_Family.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/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
index 49bf5c41aac4b5cce5660aad714a8821545cdc8c..a7527fb976d4ed4f8891434084fa647b56eaf704 100644 (file)
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.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
@@ -18,6 +18,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
+//
 
 //  SMESH DriverMED : driver to read and write 'med' files
 //  File   : DriverMED_R_SMESHDS_Mesh.cxx

diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
index 9d27ae20db6e38c85a7ba205f6a6f0135964ab18..5e4459a3234467bed5d718d7630ad31feb0e9800 100644 (file)
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.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/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
index 7ce94744beafead58cbc73c3d9b0bd384d847cf6..ade26b2b7ab24e514ee69914ca26ab4dcc4586f6 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.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/DriverMED/DriverMED_W_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
index 6b0f03138c3e44aa7edd1dc6e1bdc46a849b402f..7c02b40f02da34f38c9d55cc9f7ddc9e2401aae1 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.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/DriverMED/MED_Test.cxx b/src/DriverMED/MED_Test.cxx
index f94c0c027ac3456279ef5f77e257ced7a82a98c9..fc69fb56319a15113b20d07843213945b50d495a 100644 (file)
--- a/src/DriverMED/MED_Test.cxx
+++ b/src/DriverMED/MED_Test.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/DriverMED/Makefile.am b/src/DriverMED/Makefile.am
index 2e858e471e3ad16ff08d8d6d3970970071053537..13ac7d4515efecd0971dcb8c1501b53ffaeb9eef 100644 (file)
--- a/src/DriverMED/Makefile.am
+++ b/src/DriverMED/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/DriverMED/SMESH_DriverMED.hxx b/src/DriverMED/SMESH_DriverMED.hxx
index 92aed5cf5e4e8fa182cb6abf068990f12b95751d..df264c884b24aa7678ffdc6dc12bd1ce1a297b18 100755 (executable)
--- a/src/DriverMED/SMESH_DriverMED.hxx
+++ b/src/DriverMED/SMESH_DriverMED.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/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
index e5d260feb6c97bed9ab2f2afa64c5b841a713fdd..1a38479b68a8142e742431e29794d88b54df3885 100644 (file)
--- a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
+++ b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.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/DriverSTL/DriverSTL_R_SMDS_Mesh.h b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.h
index 86e5eaec6c3f7ec42d535c975d00d1bca9f9b840..3924e648098a7a9a8bc1c6b9d1c5ec71b3a3e062 100644 (file)
--- a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.h
+++ b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.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/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
index cf893a3271c69c732263714392fb3380d383d9cc..e3a806448525474f3c66f114fc0dfbd17aefa407 100644 (file)
--- a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
+++ b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.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/DriverSTL/DriverSTL_W_SMDS_Mesh.h b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.h
index f83284ee547580be674eab7a7ae2469234282e95..3adc180f21aa7e476a093a50afd16031b151b1f6 100644 (file)
--- a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.h
+++ b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.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/DriverSTL/Makefile.am b/src/DriverSTL/Makefile.am
index 709da5f90554452562d7add2ecd1306b1790b422..8368238b3d43a1c41332eea0d582c96e8174ebdc 100644 (file)
--- a/src/DriverSTL/Makefile.am
+++ b/src/DriverSTL/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/DriverSTL/SMESH_DriverSTL.hxx b/src/DriverSTL/SMESH_DriverSTL.hxx
index c2ecd37ea8e48707c98b0b8367f5f4793f5706cb..be4678c1587f8dee958105b579d1467a68e9fec7 100755 (executable)
--- a/src/DriverSTL/SMESH_DriverSTL.hxx
+++ b/src/DriverSTL/SMESH_DriverSTL.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/DriverSTL/STL_Test.cxx b/src/DriverSTL/STL_Test.cxx
index c060fb49e3f788600bd86bdcdbad293ec1ce7342..9b719f3e2384a2ffe450cc9f585bc86e995b84de 100644 (file)
--- a/src/DriverSTL/STL_Test.cxx
+++ b/src/DriverSTL/STL_Test.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/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
index 0ad1f8beec51033887f87d5f8d3aad78c21288ea..6856037fae4ef3ecfa6024b9ff7c40fcb2e4f6ec 100644 (file)
--- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.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/DriverUNV/DriverUNV_R_SMDS_Mesh.h b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.h
index f9545a33cb5ea2868403efacd64b694ae34e3edc..eef8215b70ab20bf3ece0b3a6216b3acd1db336d 100644 (file)
--- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.h
+++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.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/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx