From b4aeec97c42b2101ec064a7a6781fa9f58f69eb8 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:29:32 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- LIGHT_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_LIGHT.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/LIGHTGUI/LIGHTGUI.cxx | 2 +- src/LIGHTGUI/LIGHTGUI.h | 2 +- src/LIGHTGUI/LIGHTGUI_DataModel.cxx | 2 +- src/LIGHTGUI/LIGHTGUI_DataModel.h | 2 +- src/LIGHTGUI/LIGHTGUI_DataObject.cxx | 2 +- src/LIGHTGUI/LIGHTGUI_DataObject.h | 2 +- src/LIGHTGUI/LIGHTGUI_Selection.cxx | 2 +- src/LIGHTGUI/LIGHTGUI_Selection.h | 2 +- src/LIGHTGUI/LIGHTGUI_TextPrs.cxx | 2 +- src/LIGHTGUI/LIGHTGUI_TextPrs.hxx | 2 +- src/LIGHTGUI/Makefile.am | 2 +- src/Makefile.am | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/LIGHT_version.h.in b/LIGHT_version.h.in index 94637d7..e28c2aa 100644 --- a/LIGHT_version.h.in +++ b/LIGHT_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2005-2012 OPEN CASCADE +// Copyright (C) 2005-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/Makefile.am b/Makefile.am index 61542da..3e9c710 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2012 OPEN CASCADE +# Copyright (C) 2005-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 4a9f027..36ab633 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2012 OPEN CASCADE +# Copyright (C) 2005-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 598e30d..a5f3891 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2012 OPEN CASCADE +# Copyright (C) 2005-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 31ee95d..56fe1e9 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2012 OPEN CASCADE +# Copyright (C) 2005-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_LIGHT.m4 b/adm_local/unix/config_files/check_LIGHT.m4 index e372608..d289fbf 100755 --- a/adm_local/unix/config_files/check_LIGHT.m4 +++ b/adm_local/unix/config_files/check_LIGHT.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2005-2012 OPEN CASCADE +dnl Copyright (C) 2005-2013 OPEN CASCADE 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 9da0dc4..54b8dbf 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2012 OPEN CASCADE +# Copyright (C) 2005-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 3bda7f3..ab3db4f 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2012 OPEN CASCADE +# Copyright (C) 2005-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 45fa62e..f6da496 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2005-2012 OPEN CASCADE +# Copyright (C) 2005-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 faf1208..6488e49 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2005-2012 OPEN CASCADE +# Copyright (C) 2005-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 be027e7..1364ca3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2012 OPEN CASCADE +# Copyright (C) 2005-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 5e405cc..19f3208 100644 --- a/resources/LightApp.xml +++ b/resources/LightApp.xml @@ -1,5 +1,5 @@