Merge.

diff --git a/ChangeLog b/ChangeLog
index 21b6eec1585cb5fd1fd7877111e68bd6b0a83f00..440434d5ea3c19509c3d205cca429eb6dc4c56da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 
        * Re-introduce ffprobe call when adding content.
 
+2014-05-05  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.0 released.
+
 2014-05-02  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.68.0 released.

diff --git a/debian/changelog b/debian/changelog
index 75f830e298c212e86fe1de47a527d84ca6c2b75a..0f31a27167dae0e469b4194e2c0fcaedb5f193e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.68.0-1) UNRELEASED; urgency=low
+dcpomatic (1.69.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -123,8 +123,9 @@ dcpomatic (1.68.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 02 May 2014 22:01:44 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 05 May 2014 16:41:46 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 829980c38373d71861505bc0a17ed4fed7103d4c..abba29173cc41a666420173ba644b25b44911486 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.68.0devel'
+VERSION = '1.69.0devel'
 
 def options(opt):
     opt.load('compiler_cxx')