# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1481647316 -3600
# Node ID 6be6534620063d026a0e054ac80e9af77f5c9e7c
# Parent  87c71bfb4e8a8a47595796e647b7e0c59797a30f# Parent  2bdc29af95895479178be61a219977e861c90645
back to mainline

diff -r 87c71bfb4e8a -r 6be653462006 CMakeLists.txt
--- 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
diff -r 87c71bfb4e8a -r 6be653462006 NEWS
--- 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
 -------