From c76477849db81be6e9c87fe8cdba6a0cfad75443 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:48:08 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- HEXABLOCKPLUGIN_version.h.in | 2 +- Makefile.am | 2 +- adm_local/Makefile.am | 2 +- adm_local/unix/Makefile.am | 2 +- adm_local/unix/config_files/Makefile.am | 2 +- adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 | 2 +- adm_local/unix/make_common_starter.am | 2 +- bin/Makefile.am | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 2 +- idl/HEXABLOCKPlugin_Algorithm.idl | 2 +- idl/Makefile.am | 2 +- resources/HEXABLOCKPlugin.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml | 2 +- src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx | 2 +- src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.h | 2 +- src/GUI/Makefile.am | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx | 2 +- src/HEXABLOCKPlugin/Makefile.am | 2 +- src/Makefile.am | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/HEXABLOCKPLUGIN_version.h.in b/HEXABLOCKPLUGIN_version.h.in index 3fc901b..4b4ecfd 100755 --- a/HEXABLOCKPLUGIN_version.h.in +++ b/HEXABLOCKPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2012 CEA/DEN, EDF R&D +// Copyright (C) 2009-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 041ce58..7019dc7 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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 a8219b0..0ffdc4c 100755 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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 8473d5e..62e4124 100755 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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 71cf40e..2606725 100755 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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_HEXABLOCKPLUGIN.m4 b/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 index bb80030..f53b20b 100755 --- a/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 +++ b/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-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 ba9f279..373ee7d 100755 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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/bin/Makefile.am b/bin/Makefile.am index 18059c1..3006baf 100755 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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_configure b/build_configure index e3d4f52..63a41b2 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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 a5d9070..4524d6f 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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 d104b58..ccbe408 100755 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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/HEXABLOCKPlugin_Algorithm.idl b/idl/HEXABLOCKPlugin_Algorithm.idl index 8250c3d..d37eb96 100755 --- a/idl/HEXABLOCKPlugin_Algorithm.idl +++ b/idl/HEXABLOCKPlugin_Algorithm.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2012 CEA/DEN, EDF R&D +// Copyright (C) 2009-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 9d5ca99..38666be 100755 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 CEA/DEN, EDF R&D +# Copyright (C) 2009-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/HEXABLOCKPlugin.xml b/resources/HEXABLOCKPlugin.xml index a5c7c29..c228c07 100755 --- a/resources/HEXABLOCKPlugin.xml +++ b/resources/HEXABLOCKPlugin.xml @@ -1,7 +1,7 @@