# HG changeset patch # User Sebastien Jodogne # Date 1712417055 -7200 # Node ID a4326b544c5171047368853a01d2f0ced7ac96a6 # Parent c6e74cb17ad772a98a4fda78f54b19a19628cd2d# Parent 6e4b7fed295333a44c3a421ad5204756f4a31706 merge diff -r c6e74cb17ad7 -r a4326b544c51 .hgignore --- a/.hgignore Sat Apr 06 17:24:03 2024 +0200 +++ b/.hgignore Sat Apr 06 17:24:15 2024 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium # SPDX-License-Identifier: CC0-1.0 syntax: glob diff -r c6e74cb17ad7 -r a4326b544c51 .reuse/dep5 --- a/.reuse/dep5 Sat Apr 06 17:24:03 2024 +0200 +++ b/.reuse/dep5 Sat Apr 06 17:24:15 2024 +0200 @@ -8,11 +8,11 @@ License: CC0-1.0 Files: Resources/Orthanc/CMake/* Resources/Orthanc/Toolchains/* -Copyright: 2012-2016 Sebastien Jodogne, University Hospital of Liege (Belgium), 2017-2023-2024 Osimis S.A. (Belgium), and 2021-2023-2024 UCLouvain (Belgium) +Copyright: 2012-2016 Sebastien Jodogne, University Hospital of Liege (Belgium), 2017-2024 Osimis S.A. (Belgium), and 2021-2024 UCLouvain (Belgium) License: LGPL-3.0-or-later Files: Resources/Orthanc/Plugins/* Resources/Orthanc/Sdk-1.10.0/orthanc/OrthancCPlugin.h Resources/OrthancCPlugin-1.10.0.patch -Copyright: 2012-2016 Sebastien Jodogne, University Hospital of Liege (Belgium), 2017-2023-2024 Osimis S.A. (Belgium), and 2021-2023-2024 UCLouvain (Belgium) +Copyright: 2012-2016 Sebastien Jodogne, University Hospital of Liege (Belgium), 2017-2024 Osimis S.A. (Belgium), and 2021-2024 UCLouvain (Belgium) License: GPL-3.0-or-later Files: Resources/jdk8u382-b05-win32/* Resources/jdk8u382-b05-win64/*