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 1f5889a30..9e4f58db8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 
 2016-01-13  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.6.16 released.
+
+2016-01-13  Carl Hetherington  <cth@carlh.net>
+
 	* Fix incorrect fades when trim is being used.
 
 2016-01-11  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 910c2d09f..278705a88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.15-1) UNRELEASED; urgency=low
+dcpomatic (2.6.16-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -372,8 +372,9 @@ dcpomatic (2.6.15-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 10 Jan 2016 02:34:50 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 13 Jan 2016 23:24:59 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 55e1d4ed3..b4763c4fa 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.15devel'
+VERSION = '2.6.16devel'
 
 def options(opt):
     opt.load('compiler_cxx')