From: vsr Date: Thu, 19 Mar 2015 15:40:31 +0000 (+0300) Subject: Merge from rnv/geom_plugin_imp branch X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7f29a0d27a72d6f1c7b96fcd89655ca504105c44;hp=1452be8c2842890c0309ed5bbfce86af6555d439;p=plugins%2Facisplugin.git Merge from rnv/geom_plugin_imp branch --- diff --git a/ACISPLUGIN_version.h.in b/ACISPLUGIN_version.h.in index 5de0fa3..3261ed1 100644 --- a/ACISPLUGIN_version.h.in +++ b/ACISPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2014 OPEN CASCADE +// Copyright (C) 2014-2015 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/CMakeLists.txt b/CMakeLists.txt index 6b9d0d2..5324fcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014 OPEN CASCADE +# Copyright (C) 2014-2015 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/INSTALL b/INSTALL index 8b33d27..6d3de93 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ Installation Instructions ************************* -Copyright (C) 2014 Open CASCADE S.A.S. +Copyright (C) 2014-2015 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/README b/README index 7f11c49..d157e4e 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ README ****** -Copyright (C) 2014 Open CASCADE S.A.S. +Copyright (C) 2014-2015 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/SalomeACISPLUGINConfig.cmake.in b/SalomeACISPLUGINConfig.cmake.in index 7f172f7..ad13705 100644 --- a/SalomeACISPLUGINConfig.cmake.in +++ b/SalomeACISPLUGINConfig.cmake.in @@ -4,7 +4,7 @@ # ############################################################### -# Copyright (C) 2014 OPEN CASCADE +# Copyright (C) 2014-2015 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/CMakeLists.txt b/adm_local/CMakeLists.txt index 2878415..aa826d5 100644 --- a/adm_local/CMakeLists.txt +++ b/adm_local/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014 OPEN CASCADE +# Copyright (C) 2014-2015 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/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt index a91ff96..8e9b376 100644 --- a/adm_local/cmake_files/CMakeLists.txt +++ b/adm_local/cmake_files/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014 OPEN CASCADE +# Copyright (C) 2014-2015 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/cmake_files/FindACIS.cmake b/adm_local/cmake_files/FindACIS.cmake index 650c09a..776f3bf 100644 --- a/adm_local/cmake_files/FindACIS.cmake +++ b/adm_local/cmake_files/FindACIS.cmake @@ -5,7 +5,7 @@ # ######################################################################### -# Copyright (C) 2014 OPEN CASCADE +# Copyright (C) 2014-2015 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/cmake_files/FindSalomeACIS.cmake b/adm_local/cmake_files/FindSalomeACIS.cmake index 8853f84..eb46592 100644 --- a/adm_local/cmake_files/FindSalomeACIS.cmake +++ b/adm_local/cmake_files/FindSalomeACIS.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2014 OPEN CASCADE +# Copyright (C) 2014-2015 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/cmake_files/FindSalomeACISPLUGIN.cmake b/adm_local/cmake_files/FindSalomeACISPLUGIN.cmake index cbdbe6b..ec6d514 100644 --- a/adm_local/cmake_files/FindSalomeACISPLUGIN.cmake +++ b/adm_local/cmake_files/FindSalomeACISPLUGIN.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2014 OPEN CASCADE +# Copyright (C) 2014-2015 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/doc/CMakeLists.txt b/doc/CMakeLists.txt index 7eb84fe..0fd283b 100755 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2014-2015 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/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt index 957d7ef..dc3f208 100755 --- a/doc/salome/CMakeLists.txt +++ b/doc/salome/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2014-2015 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/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index 0943ad6..2657c88 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2014-2015 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/doc/salome/gui/ACISPLUGIN/CMakeLists.txt b/doc/salome/gui/ACISPLUGIN/CMakeLists.txt index 743e277..c696421 100755 --- a/doc/salome/gui/ACISPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/ACISPLUGIN/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2014-2015 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/doc/salome/gui/ACISPLUGIN/doxyfile.in b/doc/salome/gui/ACISPLUGIN/doxyfile.in index b46013d..bff5c3a 100755 --- a/doc/salome/gui/ACISPLUGIN/doxyfile.in +++ b/doc/salome/gui/ACISPLUGIN/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2014-2015 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/doc/salome/gui/ACISPLUGIN/doxyfile_py.in b/doc/salome/gui/ACISPLUGIN/doxyfile_py.in index f542a25..e3fae44 100755 --- a/doc/salome/gui/ACISPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/ACISPLUGIN/doxyfile_py.in @@ -1,4 +1,4 @@ -# Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2014-2015 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/doc/salome/gui/ACISPLUGIN/static/footer.html b/doc/salome/gui/ACISPLUGIN/static/footer.html index e21ab0c..a9dd3c1 100755 --- a/doc/salome/gui/ACISPLUGIN/static/footer.html +++ b/doc/salome/gui/ACISPLUGIN/static/footer.html @@ -4,7 +4,7 @@ diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt index 1a2a012..1f591b5 100755 --- a/doc/salome/gui/CMakeLists.txt +++ b/doc/salome/gui/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2014-2015 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/ACISPlugin.idl b/idl/ACISPlugin.idl index be59e1c..7a96a37 100644 --- a/idl/ACISPlugin.idl +++ b/idl/ACISPlugin.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2014-2015 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/CMakeLists.txt b/idl/CMakeLists.txt index f3d62b4..c93b2ec 100755 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2014-2015 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/ACISPlugin.xml b/resources/ACISPlugin.xml index e23fe28..4d6dcc3 100644 --- a/resources/ACISPlugin.xml +++ b/resources/ACISPlugin.xml @@ -1,7 +1,7 @@