From 048feae8518d2fb595bb4412f2caa1eeea11d9c9 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:07:20 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- ATOMSOLV_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_ATOMSOLV.m4 | 2 +- adm_local/unix/make_common_starter.am | 2 +- bin/Makefile.am | 2 +- bin/myrunSalome.py | 2 +- bin/runAppli.in | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 2 +- idl/ATOMSOLV.idl | 2 +- idl/Makefile.am | 2 +- resources/ATOMSOLVCatalog.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml.in | 2 +- src/ATOMSOLV/ATOMSOLV.cxx | 2 +- src/ATOMSOLV/ATOMSOLV.hxx | 2 +- src/ATOMSOLV/Makefile.am | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI.cxx | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI.h | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx | 2 +- src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h | 2 +- src/ATOMSOLVGUI/Makefile.am | 2 +- src/Makefile.am | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) 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 @@