# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1449072345 -3600
# Node ID 4d36137ffd7a127f3efd12ff5badd0d950149b45
# Parent  acb3ac7884260b92ae5f283a7012a0246db6e106# Parent  2cec44cc8c45676104ecff1c245a38c44a5bcd42
back to mainline

diff -r acb3ac788426 -r 4d36137ffd7a CMakeLists.txt
--- a/CMakeLists.txt	Wed Dec 02 16:30:12 2015 +0100
+++ b/CMakeLists.txt	Wed Dec 02 17:05:45 2015 +0100
@@ -20,7 +20,7 @@
 
 project(OrthancWebViewer)
 
-set(ORTHANC_WEBVIEWER_VERSION "mainline")
+set(ORTHANC_WEBVIEWER_VERSION "2.0")
 
 # Parameters of the build
 set(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)")
@@ -59,7 +59,7 @@
 
 # Check that the Orthanc SDK headers are available or download them
 if (STATIC_BUILD OR NOT USE_SYSTEM_ORTHANC_SDK)
-  include_directories(${ORTHANC_ROOT}/Sdk-0.9.4)
+  include_directories(${ORTHANC_ROOT}/Sdk-0.9.5)
 else ()
   CHECK_INCLUDE_FILE_CXX(orthanc/OrthancCPlugin.h HAVE_ORTHANC_H)
   if (NOT HAVE_ORTHANC_H)
diff -r acb3ac788426 -r 4d36137ffd7a NEWS
--- a/NEWS	Wed Dec 02 16:30:12 2015 +0100
+++ b/NEWS	Wed Dec 02 17:05:45 2015 +0100
@@ -1,9 +1,14 @@
 Pending changes in the mainline
 ===============================
 
+
+
+Version 2.0 (2015-12-02)
+========================
+
 => Minimum SDK version: 0.9.5 <=
 
-* The GDCM decoder replaces the built-in Orthanc decoder for Orthanc Explorer
+* The GDCM decoder replaces the built-in Orthanc decoder inside Orthanc Explorer
 * Support of multi-frame images
 * Upgrade to Cornerstone 0.8.4