changeset 5475:890df6501ffc

back to mainline
author Alain Mazy <am@osimis.io>
date Tue, 19 Dec 2023 11:13:32 +0100
parents d1992a9ec8c3 (diff) 6cb91df32207 (current diff)
children 3b45bce71fcc
files NEWS OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Tue Dec 19 10:05:57 2023 +0100
+++ b/NEWS	Tue Dec 19 11:13:32 2023 +0100
@@ -1,3 +1,7 @@
+Pending changes in the mainline
+===============================
+
+
 Version 1.12.2 (2023-12-19)
 ===========================
 
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Tue Dec 19 10:05:57 2023 +0100
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Tue Dec 19 11:13:32 2023 +0100
@@ -24,7 +24,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.12.2")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning