# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1590143436 -7200
# Node ID 22eb9453b3f5df679edad13152e15d0cfb9da5d1
# Parent  5b731d898beec5e12650b2a7145969698cd7138f
Orthanc-1.7.0

diff -r 5b731d898bee -r 22eb9453b3f5 NEWS
--- a/NEWS	Fri May 22 09:11:00 2020 +0200
+++ b/NEWS	Fri May 22 12:30:36 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 5b731d898bee -r 22eb9453b3f5 Resources/CMake/OrthancFrameworkParameters.cmake
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Fri May 22 09:11:00 2020 +0200
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Fri May 22 12:30:36 2020 +0200
@@ -3,7 +3,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.7.0")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning