# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1537453080 -7200
# Node ID 9451431582e337f7845be69ee38a45e457bd0bc9
# Parent  7133ad478eead520cb7996acb79aa0f7b2127f8b# Parent  4993ced69d311f53d04510187552f4f78a3d661a
merge

diff -r 7133ad478eea -r 9451431582e3 NEWS
--- a/NEWS	Thu Sep 20 16:17:46 2018 +0200
+++ b/NEWS	Thu Sep 20 16:18:00 2018 +0200
@@ -1,6 +1,11 @@
 Pending changes in the mainline
 ===============================
 
+
+
+Version 1.4.2 (2018-09-20)
+==========================
+
 General
 -------
 
diff -r 7133ad478eea -r 9451431582e3 Resources/CMake/OrthancFrameworkParameters.cmake