# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1544455489 -3600
# Node ID 8a7f1ff10f912253c3624be8fcfcab59676e1475
# Parent  aa0f06b43b2e7e613e69d77ca361050f7350b11d# Parent  38b71a1006fd22750bb8f9ada9d2c6085bfe26de
back to mainline

diff -r aa0f06b43b2e -r 8a7f1ff10f91 NEWS
--- a/NEWS	Mon Dec 10 12:19:19 2018 +0100
+++ b/NEWS	Mon Dec 10 16:24:49 2018 +0100
@@ -2,6 +2,9 @@
 ===============================
 
 
+Version 1.5.0 (2018-12-10)
+==========================
+
 General
 -------
 
diff -r aa0f06b43b2e -r 8a7f1ff10f91 Resources/CMake/OrthancFrameworkParameters.cmake
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Mon Dec 10 12:19:19 2018 +0100
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Mon Dec 10 16:24:49 2018 +0100
@@ -3,7 +3,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.5.0")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning