# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1449586397 -3600
# Node ID c71bf0882df19c3e3a7cd23b6c0bf505fba3cf54
# Parent  914c8f40cacb23a85d7cd8400d1168b54dd9c604# Parent  b4e8a031b0d86caf89e1a99fb7b86bb94d00c6a8
back to mainline

diff -r 914c8f40cacb -r c71bf0882df1 CMakeLists.txt
--- a/CMakeLists.txt	Tue Dec 08 11:41:36 2015 +0100
+++ b/CMakeLists.txt	Tue Dec 08 15:53:17 2015 +0100
@@ -3,7 +3,7 @@
 project(Orthanc)
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "0.9.6")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff -r 914c8f40cacb -r c71bf0882df1 NEWS
--- a/NEWS	Tue Dec 08 11:41:36 2015 +0100
+++ b/NEWS	Tue Dec 08 15:53:17 2015 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 0.9.6 (2015/12/08)
+==========================
+
 * Promiscuous mode (accept unknown SOP class UID) is now turned off by default
 * Fix serialization of DICOM buffers that might contain garbage trailing
 * Fix modality worklists server if some fields are null