# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1537446111 -7200
# Node ID d4dc6e49851dcde42e989de7663e0eb7b2e1cc54
# Parent  b51233f03e7ed5015a9fd353785709b6552c57b1# Parent  afb581263e1d79e67ebf2fc1ca85780f9f3783e5
back to mainline

diff -r b51233f03e7e -r d4dc6e49851d NEWS
--- 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
 -------
 
diff -r b51233f03e7e -r d4dc6e49851d Resources/CMake/OrthancFrameworkParameters.cmake
--- 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