changeset 4721:cf4a80a7e1a2

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 24 Jun 2021 09:16:03 +0200
parents 88d16656b8b5 (current diff) 85102d5cc936 (diff)
children 2b4da0ee6b73
files OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
diffstat 3 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Jun 23 19:00:07 2021 +0200
+++ b/NEWS	Thu Jun 24 09:16:03 2021 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.9.4 (2021-06-24)
+==========================
+
 General
 -------
 
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Jun 23 19:00:07 2021 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Thu Jun 24 09:16:03 2021 +0200
@@ -130,6 +130,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "3ea66c09f64aca990016683b6375734e")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.3")
         set(ORTHANC_FRAMEWORK_MD5 "9b86e6f00e03278293cd15643cc0233f")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.4")
+        set(ORTHANC_FRAMEWORK_MD5 "6d5ca4a73ac7d42445041ca79de1624d")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
--- a/TODO	Wed Jun 23 19:00:07 2021 +0200
+++ b/TODO	Thu Jun 24 09:16:03 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
 ----------------------------------