# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1544455534 -3600
# Node ID 01dc71f9b9e35bffcf9cd1b52bd9b2b13907dd18
# Parent  8a7f1ff10f912253c3624be8fcfcab59676e1475
back to mainline

diff -r 8a7f1ff10f91 -r 01dc71f9b9e3 Resources/CMake/OrthancFrameworkParameters.cmake
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Mon Dec 10 16:24:49 2018 +0100
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Mon Dec 10 16:25:34 2018 +0100
@@ -3,7 +3,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.5.0")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff -r 8a7f1ff10f91 -r 01dc71f9b9e3 Resources/DownloadOrthancFramework.cmake
--- a/Resources/DownloadOrthancFramework.cmake	Mon Dec 10 16:24:49 2018 +0100
+++ b/Resources/DownloadOrthancFramework.cmake	Mon Dec 10 16:25:34 2018 +0100
@@ -91,6 +91,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "9b6f6114264b17ed421b574cd6476127")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.4.2")
         set(ORTHANC_FRAMEWORK_MD5 "d1ee84927dcf668e60eb5868d24b9394")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.0")
+        set(ORTHANC_FRAMEWORK_MD5 "4429d8d9dea4ff6648df80ec3c64d79e")
       endif()
     endif()
   endif()