# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1467030774 -7200
# Node ID 96aad5f1b9f16de7cf7ba490736d73dada33cf64
# Parent  b89da14b3e8d745414d722ea4892be6c1a53c591# Parent  8fdeb348f72be7848a1b227a77a7a6adc7153286
back to mainline

diff -r b89da14b3e8d -r 96aad5f1b9f1 CMakeLists.txt
--- a/CMakeLists.txt	Mon Jun 27 11:33:22 2016 +0200
+++ b/CMakeLists.txt	Mon Jun 27 14:32:54 2016 +0200
@@ -3,7 +3,7 @@
 project(Orthanc)
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.1.0")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff -r b89da14b3e8d -r 96aad5f1b9f1 NEWS
--- a/NEWS	Mon Jun 27 11:33:22 2016 +0200
+++ b/NEWS	Mon Jun 27 14:32:54 2016 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.1.0 (2016/07/27)
+==========================
+
 General
 -------
 
diff -r b89da14b3e8d -r 96aad5f1b9f1 Plugins/Include/orthanc/OrthancCPlugin.h
--- a/Plugins/Include/orthanc/OrthancCPlugin.h	Mon Jun 27 11:33:22 2016 +0200
+++ b/Plugins/Include/orthanc/OrthancCPlugin.h	Mon Jun 27 14:32:54 2016 +0200
@@ -116,8 +116,8 @@
 #endif
 
 #define ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER     1
-#define ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER     0
-#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER  1
+#define ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER     1
+#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER  0