# HG changeset patch # User Sebastien Jodogne # Date 1547835634 -3600 # Node ID 6150748578f673904be8662890eccbe028d0daf3 # Parent d2d2a0ad833b5b78b0c44a44b7f67693f2d9f61c# Parent 169e0920634088ba788ac5816ec96c2b1739e1c8 back to mainline diff -r 169e09206340 -r 6150748578f6 Resources/CMake/OrthancFrameworkParameters.cmake --- a/Resources/CMake/OrthancFrameworkParameters.cmake Fri Jan 18 17:10:24 2019 +0100 +++ b/Resources/CMake/OrthancFrameworkParameters.cmake Fri Jan 18 19:20:34 2019 +0100 @@ -3,7 +3,7 @@ ##################################################################### # Version of the build, should always be "mainline" except in release branches -set(ORTHANC_VERSION "1.5.2") +set(ORTHANC_VERSION "mainline") # Version of the database schema. History: # * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning diff -r 169e09206340 -r 6150748578f6 Resources/DownloadOrthancFramework.cmake --- a/Resources/DownloadOrthancFramework.cmake Fri Jan 18 17:10:24 2019 +0100 +++ b/Resources/DownloadOrthancFramework.cmake Fri Jan 18 19:20:34 2019 +0100 @@ -95,6 +95,8 @@ set(ORTHANC_FRAMEWORK_MD5 "4429d8d9dea4ff6648df80ec3c64d79e") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.1") set(ORTHANC_FRAMEWORK_MD5 "099671538865e5da96208b37494d6718") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.2") + set(ORTHANC_FRAMEWORK_MD5 "8867050f3e9a1ce6157c1ea7a9433b1b") endif() endif() endif()