# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1734544431 -3600
# Node ID d683ec071458e77c3c65cb7e3b634eaf4e0d7c12
# Parent  fd04198d710efed46bf1baa1780e31d60f698ab1# Parent  9535bcd7fa8b6223f03d20921f90c860f8257531
back to mainline

diff -r fd04198d710e -r d683ec071458 CITATION.cff
--- a/CITATION.cff	Wed Dec 18 18:48:05 2024 +0100
+++ b/CITATION.cff	Wed Dec 18 18:53:51 2024 +0100
@@ -10,5 +10,5 @@
 doi: "10.1007/s10278-018-0082-y"
 license: "GPL-3.0-or-later"
 repository-code: "https://orthanc.uclouvain.be/hg/orthanc/"
-version: 1.12.4
-date-released: 2024-06-05
+version: 1.12.5
+date-released: 2024-12-18
diff -r fd04198d710e -r d683ec071458 CMakeLists.txt
--- a/CMakeLists.txt	Wed Dec 18 18:48:05 2024 +0100
+++ b/CMakeLists.txt	Wed Dec 18 18:53:51 2024 +0100
@@ -29,7 +29,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.5")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r fd04198d710e -r d683ec071458 NEWS
--- a/NEWS	Wed Dec 18 18:48:05 2024 +0100
+++ b/NEWS	Wed Dec 18 18:53:51 2024 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.18 (2024-12-18)
+=========================
+
 * Added a "Server" entry in the DICOMweb job content
 * Fixed parsing of numerical values in QIDO-RS response that prevented, among other,
   the retrieval of "NumberOfStudyRelatedInstances", "NumberOfStudyRelatedSeries",...