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 e78fdab85..273764e9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-08-31  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.11.20 released.
+
+2017-08-31  Carl Hetherington  <cth@carlh.net>
+
 	* Fix erroneous re-use of video files after turning off burnt subtitles (#1113).
 
 2017-08-30  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index e790bfbcd..57167337b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.19-1) UNRELEASED; urgency=low
+dcpomatic (2.11.20-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -511,8 +511,9 @@ dcpomatic (2.11.19-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Mon, 21 Aug 2017 00:10:06 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Thu, 31 Aug 2017 00:37:57 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 01538faa9..c47cdf7e4 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.19devel'
+VERSION = '2.11.20devel'
 
 def options(opt):
     opt.load('compiler_cxx')