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 440de949c..80101e4b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-05-26  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.69.14 released.
+
+2014-05-26  Carl Hetherington  <cth@carlh.net>
+
 	* Fix problems with non-zero FFmpeg content start times.
 
 2014-05-24  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index a952243dc..4aaabec97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.13-1) UNRELEASED; urgency=low
+dcpomatic (1.69.14-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -137,8 +137,9 @@ dcpomatic (1.69.13-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 24 May 2014 22:47:45 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 26 May 2014 00:20:55 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index c814c4de7..918c5acea 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.13devel'
+VERSION = '1.69.14devel'
 
 def options(opt):
     opt.load('compiler_cxx')