Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b95bb611f..db8415b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-05-13  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.11.4 released.
+
+2017-05-13  Carl Hetherington  <cth@carlh.net>
+
 	* Start off video content using the colour conversion
 	from their header, if present (#993).
 
diff --git a/debian/changelog b/debian/changelog
index d40f61cba..c5fedb802 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.3-1) UNRELEASED; urgency=low
+dcpomatic (2.11.4-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -491,8 +491,9 @@ dcpomatic (2.11.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Wed, 03 May 2017 17:03:07 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Sat, 13 May 2017 21:50:45 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index cffa06dc2..51f10b852 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.3devel'
+VERSION = '2.11.4devel'
 
 def options(opt):
     opt.load('compiler_cxx')