# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1737134944 -3600
# Node ID 0c6e9ec27580c47b92f5a184581d9804dc7405ff
# Parent  bded4308e04f514cc7ef91fbb02237547247b589# Parent  dfdd30fe1c0303a19a4846f1310a902b1a11259b
back to mainline

diff -r bded4308e04f -r 0c6e9ec27580 CITATION.cff
--- a/CITATION.cff	Fri Jan 17 14:19:01 2025 +0100
+++ b/CITATION.cff	Fri Jan 17 18:29:04 2025 +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-17
diff -r bded4308e04f -r 0c6e9ec27580 CMakeLists.txt
--- a/CMakeLists.txt	Fri Jan 17 14:19:01 2025 +0100
+++ b/CMakeLists.txt	Fri Jan 17 18:29:04 2025 +0100
@@ -28,7 +28,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 bded4308e04f -r 0c6e9ec27580 NEWS
--- a/NEWS	Fri Jan 17 14:19:01 2025 +0100
+++ b/NEWS	Fri Jan 17 18:29:04 2025 +0100
@@ -1,12 +1,16 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.5 (2025-01-17)
+========================
+
 * Updated OHIF to 3.9.2
-* In "dicom-web" DataSource, fixed the default app-config.js configuration
-  to enable display of PDFs.
-* Updated cached "dicom-json" version to 2.  This means that, when using
-  the "dicom-json" source, the cached metadata must be recomputed the first
-  time you open a study.
+* In "dicom-web" data source, fixed the default "app-config.js"
+  configuration to enable display of PDFs.
+* Updated cached "dicom-json" version to 2. This implies that, when using
+  the "dicom-json" source, the cached metadata will have to be recomputed
+  the first time you open a study.
 
 
 Version 1.4 (2024-11-26)