Merge master.

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 22813ba55..de702dacf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* Move email config into the KDM email page.
 
+	* Version 1.69.34 released.
+
+2014-06-21  Carl Hetherington  <cth@carlh.net>
+
 	* Version 1.69.33 released.
 
 2014-06-21  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 3a10749c2..34067724a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.33-1) UNRELEASED; urgency=low
+dcpomatic (1.69.34-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -157,8 +157,9 @@ dcpomatic (1.69.33-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 21 Jun 2014 19:09:14 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 21 Jun 2014 22:26:15 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index d35d03758..2704ec2e3 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.33devel'
+VERSION = '1.69.34devel'
 
 def options(opt):
     opt.load('compiler_cxx')