Mercurial > hg > orthanc-object-storage

changeset 137:07d30bead9f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <am@osimis.io>
date Wed, 20 Dec 2023 17:38:36 +0100
parents 02168cb50699 (diff) f22262184474 (current diff)
children 6f31581bd122
files
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Aws/CMakeLists.txt	Wed Dec 20 16:39:46 2023 +0100
+++ b/Aws/CMakeLists.txt	Wed Dec 20 17:38:36 2023 +0100
@@ -19,7 +19,7 @@
 
 project(OrthancAwsS3Storage)
 
-set(PLUGIN_VERSION "2.3.1")
+set(PLUGIN_VERSION "mainline")
 
 if (PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
--- a/Azure/CMakeLists.txt	Wed Dec 20 16:39:46 2023 +0100
+++ b/Azure/CMakeLists.txt	Wed Dec 20 17:38:36 2023 +0100
@@ -19,7 +19,7 @@
 
 project(OrthancAzureBlobStorage)
 
-set(PLUGIN_VERSION "2.3.1")
+set(PLUGIN_VERSION "mainline")
 
 if (PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
--- a/Google/CMakeLists.txt	Wed Dec 20 16:39:46 2023 +0100
+++ b/Google/CMakeLists.txt	Wed Dec 20 17:38:36 2023 +0100
@@ -19,7 +19,7 @@
 
 project(OrthancGoogleCloudStorage)
 
-set(PLUGIN_VERSION "2.3.1")
+set(PLUGIN_VERSION "mainline")
 
 if (PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
--- a/NEWS	Wed Dec 20 16:39:46 2023 +0100
+++ b/NEWS	Wed Dec 20 17:38:36 2023 +0100
@@ -1,3 +1,7 @@
+Pending changes in the mainline
+===============================
+
+
 2023-12-20 - v 2.3.1
 ====================