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

diff --git a/ChangeLog b/ChangeLog
index 3454e1da69138437f28cc657d6d6b8e046159f02..38d2911452c2742314017ce47ee3400864804a5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * Fix various confusions in translations of abbreviated
        channel names (Lc, Rc etc.)
 
+2014-05-14  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.7 released.
+
 2014-05-14  Carl Hetherington  <cth@carlh.net>
 
        * Bump libdcp to remove checks on PCM MXF edit rates,

diff --git a/debian/changelog b/debian/changelog
index 5febf11a8622af4a55ebae4eb97df602a98b7ad3..8a02510f68308acf108ca989e9cc92d20cc5a70a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.6-1) UNRELEASED; urgency=low
+dcpomatic (1.69.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -130,8 +130,9 @@ dcpomatic (1.69.6-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 13 May 2014 23:08:42 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 14 May 2014 22:53:59 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index d92369dca01b36c94fddb050c0d64d35d5e7de50..e326b40e4fb97e9e0e7959d770177bbf78cdf982 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.6devel'
+VERSION = '1.69.7devel'
 
 def options(opt):
     opt.load('compiler_cxx')