# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1449751696 -3600
# Node ID 52d939c1a760d7294e1e2b65b790926c9e6e8608
# Parent  3dc81012e76af49308ddcde23d39d1da8899b1f0# Parent  b4e983e83dff442089c1f766399c2c23ff0aba54
back to mainline

diff -r 3dc81012e76a -r 52d939c1a760 CMakeLists.txt
--- a/CMakeLists.txt	Tue Dec 08 17:05:30 2015 +0100
+++ b/CMakeLists.txt	Thu Dec 10 13:48:16 2015 +0100
@@ -20,7 +20,7 @@
 
 project(OrthancWebViewer)
 
-set(ORTHANC_WEBVIEWER_VERSION "mainline")
+set(ORTHANC_WEBVIEWER_VERSION "2.1")
 
 # Parameters of the build
 set(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)")
diff -r 3dc81012e76a -r 52d939c1a760 NEWS
--- a/NEWS	Tue Dec 08 17:05:30 2015 +0100
+++ b/NEWS	Thu Dec 10 13:48:16 2015 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 2.0 (2015-12-10)
+========================
+
 * Automatic clearing of the cache if change in the version of Orthanc or of the plugin