From a125c385182f4ec985e0945cd849852213ade2eb Mon Sep 17 00:00:00 2001
From: hluk <hluk@email.cz>
Date: Fri, 15 Aug 2014 21:01:29 -0700
Subject: [PATCH] v2.4.0

---
 CHANGES             | 13 +++++++++++++
 shared/copyq.iss    |  2 +-
 src/common/common.h |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index edc08abe51..08b988d0f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+v2.4.0
+- Separate dialog for user commands and global shortcuts
+- Search for item by row number
+- Command highlighting
+- More shortcuts can be mapped on Windows and X11
+- New "copy" command to copy from current window to clipboard
+- New "dialog" command to show dialog with custom input fields
+- Fixed crash on log out on Windows
+- Fixed clipboard monitoring on Windows
+- Fixed argument encoding from client on Windows
+- Fixed log output when printing messages from multiple processes
+- GUI fixes
+
 v2.3.0
 - Support for OS X
 - Japanese translation
diff --git a/shared/copyq.iss b/shared/copyq.iss
index 76163ae8fd..0fa93ac9b6 100644
--- a/shared/copyq.iss
+++ b/shared/copyq.iss
@@ -1,7 +1,7 @@
 ; 1. Open this file with Inno Setup with Unicode support and preprocessor.
 ; 2. Change "#defines" below (or see below how to use COPYQ_INNO_SETUP environment variable).
 ; 3. Compile "setup.exe".
-#define AppVersion "2.3.0"
+#define AppVersion "2.4.0"
 
 ; Path with build
 #define Root "C:\dev\build-copyq-Desktop-Release"
diff --git a/src/common/common.h b/src/common/common.h
index 035a4d88bc..0be074e5b1 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -27,7 +27,7 @@
 #include <QVariantMap>
 
 // Application version
-#define COPYQ_VERSION "2.3.0"
+#define COPYQ_VERSION "2.4.0"
 
 class QAction;
 class QByteArray;