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 349f370e2..a5cfa5cfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-05-13  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.69.6 released.
+
+2014-05-13  Carl Hetherington  <cth@carlh.net>
+
 	* Remove artificial 100fps limit when using
 	"any" DCP frame rate.
 
diff --git a/debian/changelog b/debian/changelog
index 243707e6a..5febf11a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.5-1) UNRELEASED; urgency=low
+dcpomatic (1.69.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -129,8 +129,9 @@ dcpomatic (1.69.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 12 May 2014 23:30:33 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 13 May 2014 23:08:42 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 7637aaab4..d92369dca 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.5devel'
+VERSION = '1.69.6devel'
 
 def options(opt):
     opt.load('compiler_cxx')