# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1467104829 -7200
# Node ID cba2a83bd19824ca8551cd8549c3fd6d6ffc1971
# Parent  4524e450979a72f1d8fa27979fb5ae57dfc64dea# Parent  0a3d234f610667a1f2689240e90128db70cf1e9a
back to mainline

diff -r 4524e450979a -r cba2a83bd198 CMakeLists.txt
--- 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)")
diff -r 4524e450979a -r cba2a83bd198 NEWS
--- 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