# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1531829171 -7200
# Node ID 0598e37efb52011c78d7fe43485f66e70aa8d659
# Parent  5bdd19c85d9fdab06fca08e159524f3a3d50e49c# Parent  218854b02a71c1ba79b446bf4273179b0098ae48
back to mainline

diff -r 5bdd19c85d9f -r 0598e37efb52 NEWS
--- a/NEWS	Tue Jul 17 12:07:52 2018 +0200
+++ b/NEWS	Tue Jul 17 14:06:11 2018 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.4.1 (2018-07-17)
+==========================
+
 * Fix deadlock in Lua scripting
 * Simplification to the "DatabaseWrapper" class
 
diff -r 5bdd19c85d9f -r 0598e37efb52 Resources/CMake/OrthancFrameworkParameters.cmake
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Tue Jul 17 12:07:52 2018 +0200
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Tue Jul 17 14:06:11 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.1")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning