# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1645621816 -3600
# Node ID 1aea0b217f702827ddd71b9ef11e417910c09792
# Parent  309fb4f027043f02e7861b9f44d2e7416d7e90e7# Parent  4dae452af79fb90a76638006116203a92743c56a
back to mainline

diff -r 4dae452af79f -r 1aea0b217f70 OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Feb 23 12:54:21 2022 +0100
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Feb 23 14:10:16 2022 +0100
@@ -142,6 +142,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "4b5d05683d747c29b2860ad79d11e62e")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.7")
         set(ORTHANC_FRAMEWORK_MD5 "c912bbb860d640d3ae3003b5c9698205")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.10.0")
+        set(ORTHANC_FRAMEWORK_MD5 "8610c82d9153f22e929f2110f8f60279")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r 4dae452af79f -r 1aea0b217f70 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Feb 23 12:54:21 2022 +0100
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Feb 23 14:10:16 2022 +0100
@@ -24,7 +24,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.10.0")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning