From: vsr <vsr@opencascade.com>
Date: Mon, 1 Apr 2013 13:48:08 +0000 (+0000)
Subject: Merge from V6_main 01/04/2013
X-Git-Tag: V7_2_0b1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c76477849db81be6e9c87fe8cdba6a0cfad75443;p=plugins%2Fhexablockplugin.git

Merge from V6_main 01/04/2013
---

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 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE meshers PUBLIC "" "desktop.dtd">
 <!--
-  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/Makefile.am b/resources/Makefile.am
index 0e89788..e54913c 100755
--- a/resources/Makefile.am
+++ b/resources/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/SalomeApp.xml b/resources/SalomeApp.xml
index 64e860a..7548e8c 100755
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -1,5 +1,5 @@
 <!--
-  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/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx
index 4f4d2f9..d3b61bc 100755
--- a/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx
@@ -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/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.h b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.h
index d2ecc42..2817ceb 100755
--- a/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.h
+++ b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.h
@@ -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/src/GUI/Makefile.am b/src/GUI/Makefile.am
index e7f84d2..61c9a56 100755
--- a/src/GUI/Makefile.am
+++ b/src/GUI/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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
index f2ed997..cd305d1 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
index 83cac7d..de00da1 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009-2011  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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
index 1c9a623..a209dc3 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
index 750f12e..2ba3210 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
index 2bef9c9..82d7a92 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
index 45a7390..1bb6fb5 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx
index b0ffdef..6395c69 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx
index c13474f..a913aeb 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx
index 27407b6..8459459 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
index ee28583..205f62d 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx
index 4a0add0..f3d1010 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
index 6431635..a5edd1c 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
index 3d95e96..fe303f0 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
@@ -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/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx
index 7b8b661..57b43a3 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx
@@ -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/src/HEXABLOCKPlugin/Makefile.am b/src/HEXABLOCKPlugin/Makefile.am
index 0b27622..ea8cee4 100755
--- a/src/HEXABLOCKPlugin/Makefile.am
+++ b/src/HEXABLOCKPlugin/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/src/Makefile.am b/src/Makefile.am
index 65fa269..d769f7b 100755
--- a/src/Makefile.am
+++ b/src/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