Merge branch 'update-changelog-for-v1.14'

dannyedel · Dec 1, 2015 · 3f9aec7 · 3f9aec7
2 parents 46f6a9c + ad39cdf
commit 3f9aec7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,21 @@ inspect the output of commands like `git diff -w v1.11..v1.12` directly.
 
 
 
+v1.14 - 2015-12-01
+------------------
+
+New features:
+
+* Translation support
+  * For now, a german translation is included, thanks to projekter.
+* Experimental i3 support
+  * If you specify the --i3-workaround=true option, dspdfviewer will try to
+    use i3-cmd to move the audience window one screen to the right.
+  * This code is not well tested, please leave feedback and suggestions.
+* Add support for Qt5
+* Add support for Windows, thanks to projekter.
+
+
 v1.13.1 - 2015-08-06
 --------------------
 

diff --git a/cmake/version_number.cmake b/cmake/version_number.cmake
@@ -30,7 +30,7 @@ if( NOT DSPDFVIEWER_VERSION )
 	# Use default
 
 	# TODO: Keep me updated!
-	set(DSPDFVIEWER_VERSION "1.14-unreleased")
+	set(DSPDFVIEWER_VERSION "1.14")
 	message(STATUS "Embedding version number ${DSPDFVIEWER_VERSION}. If you want to override this, "
 		"for example to embed the git revision you built from, please pass "
 		"-DDSPDFVIEWER_VERSION=1.2.3.4.5 to the cmake command.")