From d291c1b484e0c7780695a1765b4222977178112c Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:30:50 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- Makefile.am | 2 +- SIERPINSKY_version.h.in | 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_SIERPINSKY.m4 | 2 +- adm_local/unix/config_files/check_gd.m4 | 2 +- adm_local/unix/make_common_starter.am | 2 +- bin/Makefile.am | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 2 +- idl/Makefile.am | 2 +- idl/Sierpinsky.idl | 2 +- resources/Makefile.am | 2 +- resources/SIERPINSKYCatalog.xml.in | 2 +- resources/SalomeApp.xml.in | 2 +- resources/graph1.xml | 2 +- resources/graph2.xml | 2 +- src/Makefile.am | 2 +- src/Sierpinsky/Makefile.am | 2 +- src/Sierpinsky/SIERPINSKY_Gen_i.cxx | 2 +- src/Sierpinsky/SIERPINSKY_Gen_i.hxx | 2 +- src/SierpinskyGUI/Makefile.am | 2 +- src/SierpinskyGUI/SierpinskyGUI.cxx | 2 +- src/SierpinskyGUI/SierpinskyGUI.h | 2 +- src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx | 2 +- src/SierpinskyGUI/SierpinskyGUI_RunDlg.h | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index dcf47d0..7184687 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/SIERPINSKY_version.h.in b/SIERPINSKY_version.h.in index eb333e3..4ab76a4 100644 --- a/SIERPINSKY_version.h.in +++ b/SIERPINSKY_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/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 cd0dde4..b255502 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_SIERPINSKY.m4 b/adm_local/unix/config_files/check_SIERPINSKY.m4 index 2465563..d65dbf9 100755 --- a/adm_local/unix/config_files/check_SIERPINSKY.m4 +++ b/adm_local/unix/config_files/check_SIERPINSKY.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/config_files/check_gd.m4 b/adm_local/unix/config_files/check_gd.m4 index b51fc98..b6ef4a5 100644 --- a/adm_local/unix/config_files/check_gd.m4 +++ b/adm_local/unix/config_files/check_gd.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 9b7e259..7d7f63d 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 322e7b4..eff071d 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 d99bbc3..16d3050 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/idl/Makefile.am b/idl/Makefile.am index e17e861..58ada11 100644 --- a/idl/Makefile.am +++ b/idl/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/idl/Sierpinsky.idl b/idl/Sierpinsky.idl index e51fd46..ce6bfaf 100644 --- a/idl/Sierpinsky.idl +++ b/idl/Sierpinsky.idl @@ -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/Makefile.am b/resources/Makefile.am index de3a449..d3738d3 100644 --- a/resources/Makefile.am +++ b/resources/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/resources/SIERPINSKYCatalog.xml.in b/resources/SIERPINSKYCatalog.xml.in index 524a36a..e1feb0a 100644 --- a/resources/SIERPINSKYCatalog.xml.in +++ b/resources/SIERPINSKYCatalog.xml.in @@ -1,6 +1,6 @@