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

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ca747ea1..882e54cf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-07-18  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.11.14 released.
+
+2017-07-18  Carl Hetherington  <cth@carlh.net>
+
 	* Version 2.11.13 released.
 
 2017-07-11  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 1e07cb128..169115e6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.13-1) UNRELEASED; urgency=low
+dcpomatic (2.11.14-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -502,7 +502,10 @@ dcpomatic (2.11.13-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Tue, 18 Jul 2017 13:48:31 +0100
+  [ carl ]
+  * New upstream release.
+
+ -- carl <carl@klopp>  Tue, 18 Jul 2017 22:18:18 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 6a1f44f75..89f2f9407 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.13devel'
+VERSION = '2.11.14devel'
 
 def options(opt):
     opt.load('compiler_cxx')