# HG changeset patch # User Sebastien Jodogne # Date 1624518963 -7200 # Node ID cf4a80a7e1a2f638cbb01fc158a191266f05a360 # Parent 88d16656b8b50fb330ebfa2c48d3c2e98a559c8a# Parent 85102d5cc93627de3950a9866f548953c56e460a back to mainline diff -r 88d16656b8b5 -r cf4a80a7e1a2 NEWS --- 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 ------- diff -r 88d16656b8b5 -r cf4a80a7e1a2 OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake --- 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 diff -r 88d16656b8b5 -r cf4a80a7e1a2 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake diff -r 88d16656b8b5 -r cf4a80a7e1a2 TODO --- 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 ----------------------------------