Mercurial > hg > orthanc-dicomweb

changeset 640:c85e05785f9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
back to mainline
author Alain Mazy <am@osimis.io>
date Tue, 19 Dec 2023 12:07:22 +0100
parents d1f61cb1abf9 (current diff) 7f3f3dd90701 (diff)
children c76a2743bf8c a111b79189c2
files CMakeLists.txt
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Tue Dec 19 11:52:07 2023 +0100
+++ b/NEWS	Tue Dec 19 12:07:22 2023 +0100
@@ -1,5 +1,5 @@
-Pending changes in the mainline
-===============================
+Version 1.16 (2023-12-19)
+=========================
 
 * Removed misleading log messages about transcoding.
   https://discourse.orthanc-server.org/t/dicomweb-plugin-1-13-possible-unnecessary-transcoding/3979
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Dec 19 11:52:07 2023 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Dec 19 12:07:22 2023 +0100
@@ -191,11 +191,7 @@
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5")
         # DICOMweb 1.15 (framework pre-1.12.2)
         set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
-<<<<<<< working copy
-        set(ORTHANC_FRAMEWORK_MD5 "ebe8bdf388319f1c9536b2b680451848")
-=======
         set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f")
->>>>>>> merge rev
       endif()
     endif()
   endif()