From: vsr <vsr@opencascade.com>
Date: Mon, 1 Apr 2013 13:07:20 +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=048feae8518d2fb595bb4412f2caa1eeea11d9c9;p=samples%2Fatomsolv.git

Merge from V6_main 01/04/2013
---

diff --git a/ATOMSOLV_version.h.in b/ATOMSOLV_version.h.in
index d117ffa..eeb9758 100644
--- a/ATOMSOLV_version.h.in
+++ b/ATOMSOLV_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
 //
 // 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 b1740f2..01dc34e 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am
index 9863d29..a8acbbd 100644
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am
index 0d5ee76..c68bae1 100644
--- 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 503f115..e1f5e52 100644
--- 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_ATOMSOLV.m4 b/adm_local/unix/config_files/check_ATOMSOLV.m4
index aa4457f..7478007 100755
--- a/adm_local/unix/config_files/check_ATOMSOLV.m4
+++ b/adm_local/unix/config_files/check_ATOMSOLV.m4
@@ -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/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 3fd508d..9bf7244 100644
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/bin/Makefile.am b/bin/Makefile.am
index e4bee14..98bb465 100755
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py
index c9bf389..f727197 100755
--- a/bin/myrunSalome.py
+++ b/bin/myrunSalome.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/runAppli.in b/bin/runAppli.in
index e45801a..32ee2a7 100755
--- a/bin/runAppli.in
+++ b/bin/runAppli.in
@@ -1,6 +1,6 @@
 #!/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_configure b/build_configure
index 1a9553a..55922fe 100755
--- a/build_configure
+++ b/build_configure
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# 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/clean_configure b/clean_configure
index 9cd41ea..493cd60 100755
--- a/clean_configure
+++ b/clean_configure
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# 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 e133c45..6ec1635 100755
--- 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/idl/ATOMSOLV.idl b/idl/ATOMSOLV.idl
index 2afa310..a77df04 100644
--- a/idl/ATOMSOLV.idl
+++ b/idl/ATOMSOLV.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
 //
 // 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 5ee982a..a5b4cdc 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/resources/ATOMSOLVCatalog.xml b/resources/ATOMSOLVCatalog.xml
index 01db5a9..fedd0ac 100644
--- a/resources/ATOMSOLVCatalog.xml
+++ b/resources/ATOMSOLVCatalog.xml
@@ -1,7 +1,7 @@
 <?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
 
   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 c361641..7effc3d 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 396f217..229a518 100644
--- 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
 
   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/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx
index 9afd411..d53ca4c 100755
--- a/src/ATOMSOLV/ATOMSOLV.cxx
+++ b/src/ATOMSOLV/ATOMSOLV.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
 //
 // 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/ATOMSOLV/ATOMSOLV.hxx b/src/ATOMSOLV/ATOMSOLV.hxx
index 9df0d2d..ec5f835 100644
--- a/src/ATOMSOLV/ATOMSOLV.hxx
+++ b/src/ATOMSOLV/ATOMSOLV.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
 //
 // 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/ATOMSOLV/Makefile.am b/src/ATOMSOLV/Makefile.am
index aa8e291..de59635 100644
--- a/src/ATOMSOLV/Makefile.am
+++ b/src/ATOMSOLV/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/ATOMSOLVGUI/ATOMSOLVGUI.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
index 9126f5f..379cc61 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI.h b/src/ATOMSOLVGUI/ATOMSOLVGUI.h
index fb74915..92acb5e 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx
index a98b327..6d3a628 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
index 9a56195..8bd1c1a 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx
index 40eae69..74c61d7 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
index 3a15f0c..ca230d9 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
index 940f9a9..44b3976 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
index 8494d3b..05e4c3d 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx
index 96dc250..76c4219 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
index 56b5d71..5502ef2 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
index 83b7e59..1dde0f9 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.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
 //
 // 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/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
index 1bfbd29..e92dc17 100644
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.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
 //
 // 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/ATOMSOLVGUI/Makefile.am b/src/ATOMSOLVGUI/Makefile.am
index 25e4320..cffb03b 100644
--- a/src/ATOMSOLVGUI/Makefile.am
+++ b/src/ATOMSOLVGUI/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/Makefile.am b/src/Makefile.am
index 931520f..4f64baf 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public