# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1600431490 -7200
# Node ID f659f79eb12adf74a4d130da7fb31252d72a8250
# Parent  171af1567473f867389fd730e0049df5081b61cb# Parent  116bd42caf49d0a8e6cb3af247c5a0e440abc144
back to mainline

diff -r 116bd42caf49 -r f659f79eb12a OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Fri Sep 18 11:52:36 2020 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Fri Sep 18 14:18:10 2020 +0200
@@ -114,6 +114,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "328f94dcbd78c169655a13f7ad58a2c2")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.3")
         set(ORTHANC_FRAMEWORK_MD5 "3f1ba9502ec7c5449971d3b56087bcde")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.4")
+        set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r 116bd42caf49 -r f659f79eb12a OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Sep 18 11:52:36 2020 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Sep 18 14:18:10 2020 +0200
@@ -23,7 +23,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.7.4")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning