Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index edae42506..72514ce21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-05-28  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.69.16 released.
+
+2014-05-28  Carl Hetherington  <cth@carlh.net>
+
 	* Rework KDM generation to be about CPLs rather than DCPs,
 	and allow specification of any CPL to generate KDMs for.
 
diff --git a/debian/changelog b/debian/changelog
index 12e76bb3b..304eb01c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.15-1) UNRELEASED; urgency=low
+dcpomatic (1.69.16-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -139,8 +139,9 @@ dcpomatic (1.69.15-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 27 May 2014 14:40:35 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 28 May 2014 23:32:27 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 26b3a5fcb..4929c0d82 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.15devel'
+VERSION = '1.69.16devel'
 
 def options(opt):
     opt.load('compiler_cxx')