changeset 2227:6be653462006

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 13 Dec 2016 17:41:56 +0100
parents 87c71bfb4e8a (current diff) 2bdc29af9589 (diff)
children 577888e9ed2f
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Dec 13 15:49:03 2016 +0100
+++ b/CMakeLists.txt	Tue Dec 13 17:41:56 2016 +0100
@@ -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.2.0")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
--- a/NEWS	Tue Dec 13 15:49:03 2016 +0100
+++ b/NEWS	Tue Dec 13 17:41:56 2016 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.2.0 (2016/12/13)
+==========================
+
 General
 -------