# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1524483687 -7200
# Node ID 93e650b7f9866790787f5ba2b0385c1d5c141e75
# Parent  0ef2d8b970abb76e4dc05079d53e9f02f5ae9d23# Parent  21df474deeb16a56724c0bb3758e56f95e3eff9c
back to mainline

diff -r 0ef2d8b970ab -r 93e650b7f986 CMakeLists.txt
--- a/CMakeLists.txt	Mon Apr 23 11:42:31 2018 +0200
+++ b/CMakeLists.txt	Mon Apr 23 13:41:27 2018 +0200
@@ -21,13 +21,13 @@
 
 project(OrthancWebViewer)
 
-set(ORTHANC_WEBVIEWER_VERSION "mainline")
+set(ORTHANC_WEBVIEWER_VERSION "2.4")
 
 if (ORTHANC_WEBVIEWER_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.3.1")
+  set(ORTHANC_FRAMEWORK_VERSION "1.3.2")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 0ef2d8b970ab -r 93e650b7f986 NEWS
--- a/NEWS	Mon Apr 23 11:42:31 2018 +0200
+++ b/NEWS	Mon Apr 23 13:41:27 2018 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 2.4 (2018-04-23)
+========================
+
 * Disable pinch zoom on mobile devices
 * Fix download of DICOM instance from the toolbox
 * Fix for Osimis issue WVB-319: Some images are not loading in US_MF