# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1732639947 -3600
# Node ID 141183c5847c661980e0dc080e583e9f91706a73
# Parent  120e2262201ac4fec9e0a4ec4d9adaaec56523fe# Parent  9f36196247d74b9d979911dd3c966d5917c749c5
back to mainline

diff -r 120e2262201a -r 141183c5847c CITATION.cff
--- a/CITATION.cff	Tue Nov 26 17:17:49 2024 +0100
+++ b/CITATION.cff	Tue Nov 26 17:52:27 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.3
-date-released: 2024-01-31
+version: 1.12.4
+date-released: 2024-06-05
diff -r 120e2262201a -r 141183c5847c CMakeLists.txt
--- a/CMakeLists.txt	Tue Nov 26 17:17:49 2024 +0100
+++ b/CMakeLists.txt	Tue Nov 26 17:52:27 2024 +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.2")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 120e2262201a -r 141183c5847c NEWS
--- a/NEWS	Tue Nov 26 17:17:49 2024 +0100
+++ b/NEWS	Tue Nov 26 17:52:27 2024 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.4 (2024-11-26)
+========================
+
 * Updated OHIF to 3.9.1
 * The default value for the "DataSource" configuration is now "dicom-web"
   instead of "dicom-json" since "dicom-web" is usually