From c1f15d6b79fadbf3992b6c9b08b3e1118037fb75 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Thu, 30 Apr 2020 11:10:08 +0100
Subject: [PATCH] Update Changelog and Version

---
 ChangeLog           | 14 ++++++++++++++
 cmake/Version.cmake |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 07c2edbc4..916bb5ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+v1.12.0-snapshot
+===========
+
+Bug fixes:
+- #6663 Limit GUI log Window to prevent it using up too much RAM over time
+- #6587 Auto config setting doesn't do anything
+- #6620 Unit tests are no longer built
+
+Enhancements:
+- #6666 Add doxygen documentation output from piplines
+
+Features:
+- #6538 System-wide config for all system users
+
 v1.11.1-stable
 ===========
 
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index b7c3420f9..a7c686f51 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -5,8 +5,8 @@ cmake_minimum_required (VERSION 3.4)
 #
 
 set (SYNERGY_VERSION_MAJOR 1)
-set (SYNERGY_VERSION_MINOR 11)
-set (SYNERGY_VERSION_PATCH 2)
+set (SYNERGY_VERSION_MINOR 12)
+set (SYNERGY_VERSION_PATCH 0)
 set (SYNERGY_VERSION_STAGE "snapshot")
 
 #