changeset 2055:6aa5ae36a004

merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 27 Jun 2016 14:38:17 +0200
parents c51f6263b361 (diff) f2ecea5362fa (current diff)
children e166a902b3c4
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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