# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1608301150 -3600
# Node ID 558de9ecd107e28f559392a8e596fd1610b733ca
# Parent  3ea753570c6da60c78cfdeb18620cef5e1be021e# Parent  7874f6960d7aacda5d217b159b619536527f3f06
back to mainline

diff -r 7874f6960d7a -r 558de9ecd107 OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Fri Dec 18 14:06:45 2020 +0100
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Fri Dec 18 15:19:10 2020 +0100
@@ -120,6 +120,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.1")
         set(ORTHANC_FRAMEWORK_MD5 "db094f96399cbe8b9bbdbce34884c220")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.2")
+        set(ORTHANC_FRAMEWORK_MD5 "8bfa10e66c9931e74111be0bfb1f4548")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r 7874f6960d7a -r 558de9ecd107 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Dec 18 14:06:45 2020 +0100
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Dec 18 15:19:10 2020 +0100
@@ -23,7 +23,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.8.2")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning