From 3cc066ca3cbea545951b0b5c04673adae62a2fda Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:29:45 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- 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_PYLIGHT.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/PYLIGHT_en.xml | 2 +- resources/SalomeApp.xml.in | 2 +- src/Makefile.am | 2 +- src/PYLIGHTGUI/Makefile.am | 2 +- src/PYLIGHTGUI/PYLIGHTGUI.py | 2 +- src/PYLIGHTGUI/PYLIGHT_DataModel.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index 92060dd..dbcd8e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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 98ec131..0a5ecb0 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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 9957566..46d74db 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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 c56f080..9a8baac 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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_PYLIGHT.m4 b/adm_local/unix/config_files/check_PYLIGHT.m4 index fbb32cd..3fe3a03 100755 --- a/adm_local/unix/config_files/check_PYLIGHT.m4 +++ b/adm_local/unix/config_files/check_PYLIGHT.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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 fe8e1e7..7c79e66 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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 8a53a72..415eedf 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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 727ec31..8ce6467 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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 28a9a40..7e2aec0 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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 d599a21..c49ce1d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2012 OPEN CASCADE +# Copyright (C) 2009-2013 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 b16fa29..5568231 100644 --- a/resources/LightApp.xml +++ b/resources/LightApp.xml @@ -1,5 +1,5 @@