Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c3d89794..29b6113f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-16  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.12.11 released.
+
 2018-09-04  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.12.10 released.
diff --git a/debian/changelog b/debian/changelog
index 763ee42a8..2d7d1a67b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.12.10-1) UNRELEASED; urgency=low
+dcpomatic (2.12.11-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -582,8 +582,9 @@ dcpomatic (2.12.10-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Tue, 04 Sep 2018 23:35:03 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Sun, 16 Sep 2018 16:25:19 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 8204985d2..db9fa6456 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.12.10devel'
+VERSION = '2.12.11devel'
 
 def options(opt):
     opt.load('compiler_cxx')