# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1648065750 -3600
# Node ID 773da384dd74337d8b9b227cbf17cfc9239a1006
# Parent  0a255ec7a5e97e405f10e4b798f2e05be606b1ca# Parent  d5d420f52a3cd33b707b183ac414f95b5351ba98
back to mainline

diff -r 0a255ec7a5e9 -r 773da384dd74 CMakeLists.txt
--- a/CMakeLists.txt	Wed Mar 23 18:49:07 2022 +0100
+++ b/CMakeLists.txt	Wed Mar 23 21:02:30 2022 +0100
@@ -21,13 +21,13 @@
 
 project(OrthancGdcm)
 
-SET(PLUGIN_VERSION "mainline" CACHE STRING "Version of the plugin")
+SET(PLUGIN_VERSION "1.5" CACHE STRING "Version of the plugin")
 
 if (PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.4")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.10.1")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 0a255ec7a5e9 -r 773da384dd74 NEWS
--- a/NEWS	Wed Mar 23 18:49:07 2022 +0100
+++ b/NEWS	Wed Mar 23 21:02:30 2022 +0100
@@ -1,10 +1,15 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.5 (2022-03-23)
+========================
+
 * Take the configuration option "RestrictTransferSyntaxes" into
   account not only for decoding, but also for transcoding
 * Upgrade to GDCM 3.0.10 for static builds
 
+
 Version 1.4 (2021-07-06)
 ========================