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 7e8f3e269..1f74fba7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-11  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.11.12 released.
+
 2017-07-04  Carl Hetherington  <cth@carlh.net>
 
 	* Tentative fix for incorrect colours with logarithmic DPX sources.
diff --git a/debian/changelog b/debian/changelog
index 29b3a4573..d5b4cb449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.11-1) UNRELEASED; urgency=low
+dcpomatic (2.11.12-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -499,8 +499,9 @@ dcpomatic (2.11.11-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Sun, 18 Jun 2017 23:16:12 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Tue, 11 Jul 2017 14:31:15 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 3b6f24617..638b2c69f 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.11devel'
+VERSION = '2.11.12devel'
 
 def options(opt):
     opt.load('compiler_cxx')