# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1684495978 -7200
# Node ID ad4d62a9422d63692bc40e1deac2c49c4d305fcc
# Parent  59117a506f9f51c2c29a2c124bce6bb3462b095a# Parent  607d918270a2017c26189bd1edf2947bdccfff2d
back to mainline

diff -r 59117a506f9f -r ad4d62a9422d CMakeLists.txt
--- a/CMakeLists.txt	Fri May 19 13:07:33 2023 +0200
+++ b/CMakeLists.txt	Fri May 19 13:32:58 2023 +0200
@@ -28,7 +28,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.10.1")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.0")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 59117a506f9f -r ad4d62a9422d NEWS
--- a/NEWS	Fri May 19 13:07:33 2023 +0200
+++ b/NEWS	Fri May 19 13:32:58 2023 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.1 (2023-05-19)
+========================
+
 * Upgrade to VolView 4.1.1