# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1702984042 -3600
# Node ID c85e05785f9fcfc518825285df68e1a2e0dcc398
# Parent  d1f61cb1abf9faf128897a7e0d701f52cbcdd6ed# Parent  7f3f3dd90701572bc90a18148d02e9428c86be24
back to mainline

diff -r d1f61cb1abf9 -r c85e05785f9f CMakeLists.txt
diff -r d1f61cb1abf9 -r c85e05785f9f NEWS
--- 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
diff -r d1f61cb1abf9 -r c85e05785f9f Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- 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()