# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1467031097 -7200
# Node ID 6aa5ae36a0047ea82caa5626d3157f907235772a
# Parent  c51f6263b361a0e5695c13b1be230d778670c021# Parent  f2ecea5362fae7ffc04a9919fa2529210c07c165
merge

diff -r f2ecea5362fa -r 6aa5ae36a004 CMakeLists.txt
--- a/CMakeLists.txt	Mon Jun 27 14:38:05 2016 +0200
+++ b/CMakeLists.txt	Mon Jun 27 14:38:17 2016 +0200
@@ -3,7 +3,7 @@
 project(Orthanc)
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.1.0")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning