From 3275b1abf75b243732fe1a5ea9f3a772bd9a58c7 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:06:48 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- ATOMIC_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_ATOMIC.m4 | 2 +- adm_local/unix/make_common_starter.am | 2 +- bin/Makefile.am | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 2 +- resources/LightApp.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml.in | 2 +- src/ATOMICGUI/ATOMICGUI.cxx | 2 +- src/ATOMICGUI/ATOMICGUI.h | 2 +- src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h | 2 +- src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_AddAtomOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_CreateMolOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_Data.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_Data.h | 2 +- src/ATOMICGUI/ATOMICGUI_DataModel.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_DataModel.h | 2 +- src/ATOMICGUI/ATOMICGUI_DataObject.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_DataObject.h | 2 +- src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_DeleteOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_ImportExportOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_Operation.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_Operation.h | 2 +- src/ATOMICGUI/ATOMICGUI_RenameOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_RenameOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_Selection.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_Selection.h | 2 +- src/ATOMICGUI/Makefile.am | 2 +- src/AtomicPy/AtomicPy.cxx | 2 +- src/AtomicPy/AtomicPy.h | 2 +- src/AtomicPy/AtomicPy.sip | 2 +- src/AtomicPy/Makefile.am | 2 +- src/Makefile.am | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ATOMIC_version.h.in b/ATOMIC_version.h.in index 8d06c29..9bc83db 100644 --- a/ATOMIC_version.h.in +++ b/ATOMIC_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 9feda47..046226d 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 86b933e..0d24226 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_ATOMIC.m4 b/adm_local/unix/config_files/check_ATOMIC.m4 index f4c21be..4eb688f 100755 --- a/adm_local/unix/config_files/check_ATOMIC.m4 +++ b/adm_local/unix/config_files/check_ATOMIC.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 2f9a5ee..3954a9a 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 64ec0dd..eddc548 100644 --- 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/build_configure b/build_configure index 0e268e1..9633c7e 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 1decc20..134e1cd 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 6026d7a..5b28f0e 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/resources/LightApp.xml b/resources/LightApp.xml index 4e37e3a..77bcd7b 100644 --- a/resources/LightApp.xml +++ b/resources/LightApp.xml @@ -1,6 +1,6 @@