# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1693399981 -7200
# Node ID 286368f6f019136080160fa7b3c649995eaec193
# Parent  55de4be5608cf2b529f6f62cdb2f0a71e89095d9# Parent  69c9e376b73eaa4589cc0371bee04fbec2c50c16
back to mainline

diff -r 55de4be5608c -r 286368f6f019 CMakeLists.txt
--- a/CMakeLists.txt	Wed Aug 30 14:46:39 2023 +0200
+++ b/CMakeLists.txt	Wed Aug 30 14:53:01 2023 +0200
@@ -7,7 +7,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.10.0")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.1")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 55de4be5608c -r 286368f6f019 NEWS
--- a/NEWS	Wed Aug 30 14:46:39 2023 +0200
+++ b/NEWS	Wed Aug 30 14:53:01 2023 +0200
@@ -1,7 +1,11 @@
 Pending changes in the mainline
 ===============================
 
-* New functions from the SDK wrapped in Python:
+
+Version 4.1 (2023-08-30)
+========================
+
+* New function from the SDK wrapped in Python:
   - orthanc.RegisterStorageCommitmentScpCallback()
 * New configuration section "Python" to group settings related to the plugin:
   - "Python.Path" is an alias for global option "PythonScript"
@@ -12,8 +16,8 @@
 Maintenance
 -----------
 
-* Fix memory leaks when a python script calls orthanc.RestApiPost() and sibling methods,
-  in IncomingHttpRequestFilter and in the CMove callback.
+* Fix memory leaks when a python script calls orthanc.RestApiPost() and sibling
+  methods, in IncomingHttpRequestFilter and in the CMove callback.
 * New builders for Windows: Supporting 32 / 64bit with Python 3.9 / 3.10 / 3.11