# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1702980812 -3600
# Node ID 890df6501ffc135ff692dd384583d05c39ceb659
# Parent  d1992a9ec8c3d83e8928c61fb42c9f9e6dbf6374# Parent  6cb91df3220751e1a0db9c39989e0f08e2a63f14
back to mainline

diff -r 6cb91df32207 -r 890df6501ffc NEWS
--- 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)
 ===========================
 
diff -r 6cb91df32207 -r 890df6501ffc OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- 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