From: Carl Hetherington <cth@carlh.net>
Date: Fri, 16 May 2014 10:42:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.0.48~551^2~193
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=47f064f6a204ba6c34d8615f260b0cf3ba8850b1;hp=ae1c1a7d71e9ff514865fcd51e97e2bad8828c5d;p=dcpomatic.git

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

diff --git a/ChangeLog b/ChangeLog
index 3454e1da6..38d291145 100644
--- 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 5febf11a8..8a02510f6 100644
--- 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 d92369dca..e326b40e4 100644
--- 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')