changeset 200:93e650b7f986

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 23 Apr 2018 13:41:27 +0200
parents 0ef2d8b970ab (current diff) 21df474deeb1 (diff)
children 319c1405ee64
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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()
 
--- 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