# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1602792007 -7200
# Node ID a4af6eaca23ecabf108f1f00cdc28d7fb0ad2346
# Parent  2221051b42df50bc366019c2c384c8edb9b16691
Orthanc-1.8.0

diff -r 2221051b42df -r a4af6eaca23e NEWS
--- a/NEWS	Thu Oct 15 20:08:44 2020 +0200
+++ b/NEWS	Thu Oct 15 22:00:07 2020 +0200
@@ -1,11 +1,12 @@
 Pending changes in the mainline
 ===============================
 
-General
--------
+
+Version 1.8.0 (2020-10-16)
+==========================
 
 * Serving the content of Orthanc as a WebDAV network share
-* New configuration options: "WebDavEnabled", "WebDavDeleteAllowed" and "WebDavUploadAllowed"
+* New config options: "WebDavEnabled", "WebDavDeleteAllowed" and "WebDavUploadAllowed"
 
 
 Version 1.7.4 (2020-09-18)
diff -r 2221051b42df -r a4af6eaca23e OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Thu Oct 15 20:08:44 2020 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Thu Oct 15 22:00:07 2020 +0200
@@ -23,7 +23,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.8.0")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning