changeset 138:cba2a83bd198

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 28 Jun 2016 11:07:09 +0200
parents 4524e450979a (current diff) 0a3d234f6106 (diff)
children fec07e613b24
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Mon Jun 27 14:05:47 2016 +0200
+++ b/CMakeLists.txt	Tue Jun 28 11:07:09 2016 +0200
@@ -20,7 +20,7 @@
 
 project(OrthancWebViewer)
 
-set(ORTHANC_WEBVIEWER_VERSION "mainline")
+set(ORTHANC_WEBVIEWER_VERSION "2.2")
 
 # Parameters of the build
 set(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)")
--- a/NEWS	Mon Jun 27 14:05:47 2016 +0200
+++ b/NEWS	Tue Jun 28 11:07:09 2016 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 2.2 (2016-06-28)
+========================
+
 * Option "EnableGdcm" to replace the built-in decoder of Orthanc with GDCM
 * Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
 * Fixed rendering of 16bpp images if values are < 0 or >= 32768