# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1717602780 -7200
# Node ID b89439c1491651ebe63d02d8a674f9959056d805
# Parent  53ddff5dccaf9a9f16cb271e8eb3f50ba01448d7# Parent  5e99cf9eebcf8e640b83fe9601993dd732a5a71c
back to mainline

diff -r 5e99cf9eebcf -r b89439c14916 OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Jun 05 17:44:48 2024 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Jun 05 17:53:00 2024 +0200
@@ -163,6 +163,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "d2476b9e796e339ac320b5333489bdb3")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.3")
         set(ORTHANC_FRAMEWORK_MD5 "975f5bf2142c22cb1777b4f6a0a614c5")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.4")
+        set(ORTHANC_FRAMEWORK_MD5 "1e61779ea4a7cd705720bdcfed8a6a73")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r 5e99cf9eebcf -r b89439c14916 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Jun 05 17:44:48 2024 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Jun 05 17:53:00 2024 +0200
@@ -25,7 +25,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.12.4")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning