From cb382ec9133a8545d9bb1e12fa3253993fc53b9a Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Fri, 23 May 2014 15:43:58 +0000
Subject: [PATCH] [no-issue] version to 1.5.0

---
 CMakeLists.txt | 4 ++--
 ChangeLog      | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d947d78..6d6b770f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@
 
 # Version number for Synergy
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 4)
-set(VERSION_REV 19)
+set(VERSION_MINOR 5)
+set(VERSION_REV 0)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}")
 
 cmake_minimum_required(VERSION 2.6)
diff --git a/ChangeLog b/ChangeLog
index 162398aa..74f00546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1.5.0
+=====
+Bug #4060 - Key stuck down on Windows server
+Bug #4061 - Windows server repeats modifier keys
+
 1.4.18
 ======
 Bug #3980 - Shell extension DLL causes explorer.exe to crash