From: vsr Date: Tue, 31 May 2022 08:59:51 +0000 (+0300) Subject: Merge branch 'V9_9_BR' X-Git-Tag: V9_9_1b1^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9424ad6fd6375ff4a4c89ebd6ffeb852bf38b841;hp=0f91b8c9e4194b09dd158a1995da24205e598164;p=samples%2Fgenericsolver.git Merge branch 'V9_9_BR' --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 188e11d..5dadf24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -38,7 +38,7 @@ ENDIF() # Versioning # =========== -SALOME_SETUP_VERSION(9.8.0) +SALOME_SETUP_VERSION(9.9.0) MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"") # Find KERNEL diff --git a/SalomeGENERICSOLVERConfig.cmake.in b/SalomeGENERICSOLVERConfig.cmake.in index e1b5e38..6c42554 100644 --- a/SalomeGENERICSOLVERConfig.cmake.in +++ b/SalomeGENERICSOLVERConfig.cmake.in @@ -5,7 +5,7 @@ # ############################################################### -# Copyright (C) 2012-2021 EDF R&D +# Copyright (C) 2012-2022 EDF R&D # # 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 f6e9128..eee822f 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # 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/DEVIATION_Gen.idl b/idl/DEVIATION_Gen.idl index f5ea1bb..5835514 100644 --- a/idl/DEVIATION_Gen.idl +++ b/idl/DEVIATION_Gen.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2021 EDF R&D +// Copyright (C) 2009-2022 EDF R&D // // 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/GENERICSOLVER_Gen.idl b/idl/GENERICSOLVER_Gen.idl index 8993565..72321db 100644 --- a/idl/GENERICSOLVER_Gen.idl +++ b/idl/GENERICSOLVER_Gen.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2021 EDF R&D +// Copyright (C) 2009-2022 EDF R&D // // 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/CMakeLists.txt b/resources/CMakeLists.txt index 5e45480..4cab9db 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # 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/yacsgen_example.py b/resources/yacsgen_example.py index 080f4da..d18e387 100755 --- a/resources/yacsgen_example.py +++ b/resources/yacsgen_example.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # 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/src/CMakeLists.txt b/src/CMakeLists.txt index c017153..3387fff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # 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/src/GENERICSOLVER/CMakeLists.txt b/src/GENERICSOLVER/CMakeLists.txt index 7e76350..bebb37f 100644 --- a/src/GENERICSOLVER/CMakeLists.txt +++ b/src/GENERICSOLVER/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # 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/src/GENERICSOLVER/DEVIATION.py b/src/GENERICSOLVER/DEVIATION.py index 3b0babd..c725e92 100644 --- a/src/GENERICSOLVER/DEVIATION.py +++ b/src/GENERICSOLVER/DEVIATION.py @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # 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/src/GENERICSOLVER/GENERICSOLVER.py b/src/GENERICSOLVER/GENERICSOLVER.py index c53c3f1..16f48c3 100644 --- a/src/GENERICSOLVER/GENERICSOLVER.py +++ b/src/GENERICSOLVER/GENERICSOLVER.py @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # 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/src/GENERICSOLVERGUI/CMakeLists.txt b/src/GENERICSOLVERGUI/CMakeLists.txt index 481a5d1..41a9373 100644 --- a/src/GENERICSOLVERGUI/CMakeLists.txt +++ b/src/GENERICSOLVERGUI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # 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/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py b/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py index dda81ad..672eeef 100644 --- a/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py +++ b/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2021 EDF R&D +# Copyright (C) 2009-2022 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public