# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1531489635 -7200
# Node ID 8719a94bc731103ffebb5da61341928baef7006f
# Parent  fe4fe52f0c945e84373902fa84aeb049f7e1cef8# Parent  a2536c0d72deda960f2908e7bdcc56929837a0bf
back to mainline

diff -r fe4fe52f0c94 -r 8719a94bc731 NEWS
--- 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
 -------
 
diff -r fe4fe52f0c94 -r 8719a94bc731 Resources/CMake/OrthancFrameworkParameters.cmake
--- 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