# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1438521623 -7200
# Node ID 1afecafccc28c3deb62d1dc2d698bc343cbe4947
# Parent  5cb879c4d13d72a71925f006808a9161f9927efe# Parent  87a061d8cce3828be0567fd8eaa43b05dc3894c9
back to mainline

diff -r 5cb879c4d13d -r 1afecafccc28 CMakeLists.txt
--- a/CMakeLists.txt	Sun Aug 02 13:21:25 2015 +0200
+++ b/CMakeLists.txt	Sun Aug 02 15:20:23 2015 +0200
@@ -20,7 +20,7 @@
 
 project(OrthancPostgreSQL)
 
-set(ORTHANC_POSTGRESQL_VERSION "mainline")
+set(ORTHANC_POSTGRESQL_VERSION "1.2")
 
 
 # Parameters of the build
diff -r 5cb879c4d13d -r 1afecafccc28 NEWS
--- a/NEWS	Sun Aug 02 13:21:25 2015 +0200
+++ b/NEWS	Sun Aug 02 15:20:23 2015 +0200
@@ -1,8 +1,12 @@
 Pending changes in the mainline
 ===============================
 
+
+Release 1.2 (2015/08/02)
+========================
+
 * Inject version information into Windows binaries
-* Option to prevent compiling the unit tests (if no PostgreSQL test server is available)
+* CMake flag to prevent compiling the unit tests (if no PostgreSQL test server is available)
 * Update to Boost 1.58.0 for static and Windows builds
 * Support of OS X compilation