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 146f608a8..1667f599d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-21  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.12.16 released.
+
 2019-01-15  Carl Hetherington  <cth@carlh.net>
 
 	* Add --encrypt/-e option to dcpomatic_create.
diff --git a/debian/changelog b/debian/changelog
index 13f48597f..6d8896611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.12.15-1) UNRELEASED; urgency=low
+dcpomatic (2.12.16-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -587,8 +587,9 @@ dcpomatic (2.12.15-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Sat, 29 Dec 2018 12:36:20 +0000
+ -- Carl Hetherington <carl@main.carlh.net>  Mon, 21 Jan 2019 12:55:43 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index db3c90dba..120530978 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.12.15devel'
+VERSION = '2.12.16devel'
 
 def options(opt):
     opt.load('compiler_cxx')