Merge remote-tracking branch 'origin/master'

hluk · Jul 7, 2015 · 3ea4193 · 3ea4193
2 parents dd354fd + 7f8fefc
commit 3ea4193
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,11 @@
+v2.4.8
+- New command to show main window under mouse cursor or at a position with custom size
+- Hide clipboard content when "application/x-copyq-hidden" is "1"
+- "Copy next/previous item" command waits for clipboard to be set
+- Fixed updating window title and tray tool tip on X11
+- Fixed modifying multiple commands in Command dialog
+- Fixed implicit date to string convertions
+
 v2.4.7
 - Separate dialog for command help
 - Added scriptable function visible() to check main window visibility

diff --git 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.4.7"
+#define AppVersion "2.4.8"
 
 ; Path with build
 #define Root "C:\dev\build-copyq-Desktop-Release"

diff --git a/src/common/version.h b/src/common/version.h
@@ -2,7 +2,7 @@
 #define VERSION_H
 
 #ifndef COPYQ_VERSION
-#   define COPYQ_VERSION "v2.4.7"
+#   define COPYQ_VERSION "v2.4.8"
 #endif
 
 #endif