# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1652092144 -7200
# Node ID 258d1ae8f5a8a8fbfaaf9ab7a9f843083942f47f
# Parent  e25689b5f0a32ef82945bf0a376c59d9497bc88c# Parent  f8d2defe8f17e6142ffbce07defab33449a9ffd0
back to mainline

diff -r f8d2defe8f17 -r 258d1ae8f5a8 NEWS
--- a/NEWS	Mon May 09 11:19:44 2022 +0200
+++ b/NEWS	Mon May 09 12:29:04 2022 +0200
@@ -1,3 +1,7 @@
+Pending changes in the mainline
+===========================
+
+
 Version 1.11.0 (2022-05-09)
 ===========================
 
diff -r f8d2defe8f17 -r 258d1ae8f5a8 OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Mon May 09 11:19:44 2022 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Mon May 09 12:29:04 2022 +0200
@@ -146,6 +146,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "8610c82d9153f22e929f2110f8f60279")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.10.1")
         set(ORTHANC_FRAMEWORK_MD5 "caf667fc5ea452b3d0c2f70bfd02599c")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.11.0")
+        set(ORTHANC_FRAMEWORK_MD5 "962c4a4a706a2ef28b390d8515dd7091")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r f8d2defe8f17 -r 258d1ae8f5a8 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Mon May 09 11:19:44 2022 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Mon May 09 12:29:04 2022 +0200
@@ -24,7 +24,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.11.0")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning