# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1624514898 -7200
# Node ID 85102d5cc93627de3950a9866f548953c56e460a
# Parent  88d16656b8b50fb330ebfa2c48d3c2e98a559c8a
Orthanc-1.9.4

diff -r 88d16656b8b5 -r 85102d5cc936 NEWS
--- a/NEWS	Wed Jun 23 19:00:07 2021 +0200
+++ b/NEWS	Thu Jun 24 08:08:18 2021 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.9.4 (2021-06-24)
+==========================
+
 General
 -------
 
diff -r 88d16656b8b5 -r 85102d5cc936 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Jun 23 19:00:07 2021 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Thu Jun 24 08:08:18 2021 +0200
@@ -23,7 +23,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.9.4")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff -r 88d16656b8b5 -r 85102d5cc936 TODO
--- a/TODO	Wed Jun 23 19:00:07 2021 +0200
+++ b/TODO	Thu Jun 24 08:08:18 2021 +0200
@@ -230,15 +230,6 @@
   https://groups.google.com/g/orthanc-users/c/KASEJ9Gx3vQ/m/MIJFJdRhAwAJ
 * Standalone tool to detect orphan files in OrthancStorage
 
------
-Legal
------
-
-* Drop "OpenSSL Exception" from the Orthanc license once OpenSSL 3.0.0
-  is released, because that version will replace "OpenSSL license"
-  (incompatible with GPL) by "Apache License 2.0" (compatible with
-  GPL): https://people.gnome.org/~markmc/openssl-and-the-gpl.html
-  
 ----------------------------------
 Code quality and integration tests
 ----------------------------------