changeset 2734:8719a94bc731

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 13 Jul 2018 15:47:15 +0200
parents fe4fe52f0c94 (current diff) a2536c0d72de (diff)
children d43c669cc93d
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Fri Jul 13 12:35:31 2018 +0200
+++ b/NEWS	Fri Jul 13 15:47:15 2018 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.4.0 (2018-07-13)
+==========================
+
 General
 -------
 
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Jul 13 12:35:31 2018 +0200
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Jul 13 15:47:15 2018 +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.4.0")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning