# HG changeset patch # User Sebastien Jodogne # Date 1584539221 -3600 # Node ID df69a5fdc836cb1d13e6c93028ff4ca007c68f45 # Parent 920c7ffb1187a4bf60a2b4c5a1afd9cdfa43c164# Parent 64a095d133a8a4c5c7ac7a951821933ed2985ed0 back to mainline diff -r 64a095d133a8 -r df69a5fdc836 Resources/CMake/OrthancFrameworkParameters.cmake --- a/Resources/CMake/OrthancFrameworkParameters.cmake Wed Mar 18 13:12:46 2020 +0100 +++ b/Resources/CMake/OrthancFrameworkParameters.cmake Wed Mar 18 14:47:01 2020 +0100 @@ -3,7 +3,7 @@ ##################################################################### # Version of the build, should always be "mainline" except in release branches -set(ORTHANC_VERSION "1.6.0") +set(ORTHANC_VERSION "mainline") # Version of the database schema. History: # * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning diff -r 64a095d133a8 -r df69a5fdc836 Resources/DownloadOrthancFramework.cmake --- a/Resources/DownloadOrthancFramework.cmake Wed Mar 18 13:12:46 2020 +0100 +++ b/Resources/DownloadOrthancFramework.cmake Wed Mar 18 14:47:01 2020 +0100 @@ -112,6 +112,8 @@ set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.8") set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.6.0") + set(ORTHANC_FRAMEWORK_MD5 "eab428d6e53f61e847fa360bb17ebe25") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc