changeset 2834:d4dc6e49851d

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Sep 2018 14:21:51 +0200
parents b51233f03e7e (current diff) afb581263e1d (diff)
children 4993ced69d31
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Thu Sep 20 11:27:48 2018 +0200
+++ b/NEWS	Thu Sep 20 14:21:51 2018 +0200
@@ -1,6 +1,11 @@
 Pending changes in the mainline
 ===============================
 
+
+
+Version 1.4.2 (2018-09-20)
+==========================
+
 General
 -------
 
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Thu Sep 20 11:27:48 2018 +0200
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Thu Sep 20 14:21:51 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.2")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning