# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1549639989 -3600
# Node ID abb204aed6bf7586ada38811e5d53d499e3925e0
# Parent  e1f6c089fe3031312ec1d853051ee2eed3539792# Parent  30418468410719d5301689330d1d282ff61e9751
back to mainline

diff -r 304184684107 -r abb204aed6bf Resources/CMake/OrthancFrameworkParameters.cmake
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Feb 08 15:02:50 2019 +0100
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Feb 08 16:33:09 2019 +0100
@@ -3,7 +3,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.5.4")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff -r 304184684107 -r abb204aed6bf Resources/DownloadOrthancFramework.cmake
--- a/Resources/DownloadOrthancFramework.cmake	Fri Feb 08 15:02:50 2019 +0100
+++ b/Resources/DownloadOrthancFramework.cmake	Fri Feb 08 16:33:09 2019 +0100
@@ -99,6 +99,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "8867050f3e9a1ce6157c1ea7a9433b1b")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.3")
         set(ORTHANC_FRAMEWORK_MD5 "bf2f5ed1adb8b0fc5f10d278e68e1dfe")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.4")
+        set(ORTHANC_FRAMEWORK_MD5 "404baef5d4c43e7c5d9410edda8ef5a5")
       endif()
     endif()
   endif()