# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1590158601 -7200
# Node ID b04e1b3b8a7f7f665327d91ee559fec8cc3f28b1
# Parent  4d1dcdf5c57e7e21951bf3cddb9d31e85d42a4cf# Parent  170667f08642f86fd58af963eed8d2d2840ec1e1
merge

diff -r 4d1dcdf5c57e -r b04e1b3b8a7f NEWS
--- a/NEWS	Fri May 22 16:43:10 2020 +0200
+++ b/NEWS	Fri May 22 16:43:21 2020 +0200
@@ -1,16 +1,21 @@
 Pending changes in the mainline
 ===============================
 
+
+
+Version 1.7.0 (2020-05-22)
+==========================
+
 General
 -------
 
+* Support of DICOM C-GET SCP (contribution by Varian)
 * DICOM transcoding over the REST API
 * Transcoding from compressed to uncompressed transfer syntaxes over DICOM
   C-STORE SCU (if the remote modality doesn't support compressed syntaxes)
 * New configuration options related to transcoding:
   "TranscodeDicomProtocol", "BuiltinDecoderTranscoderOrder",
   "IngestTranscoding" and "DicomLossyTranscodingQuality"
-* Support of DICOM C-GET SCP (contribution by Varian)
 
 REST API
 --------
diff -r 4d1dcdf5c57e -r b04e1b3b8a7f Resources/CMake/OrthancFrameworkParameters.cmake
diff -r 4d1dcdf5c57e -r b04e1b3b8a7f Resources/DownloadOrthancFramework.cmake
--- a/Resources/DownloadOrthancFramework.cmake	Fri May 22 16:43:10 2020 +0200
+++ b/Resources/DownloadOrthancFramework.cmake	Fri May 22 16:43:21 2020 +0200
@@ -116,6 +116,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "eab428d6e53f61e847fa360bb17ebe25")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.6.1")
         set(ORTHANC_FRAMEWORK_MD5 "3971f5de96ba71dc9d3f3690afeaa7c0")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.0")
+        set(ORTHANC_FRAMEWORK_MD5 "ce5f689e852b01d3672bd3d2f952a5ef")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc