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

diff --git a/ChangeLog b/ChangeLog
index fc70460d220db3613f1fd0e7b5de357f2ed6cb40..3cc95f69af54d7ea6480e874cff460208382859a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-21  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.33 released.
+
 2014-06-21  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.69.32 released.

diff --git a/debian/changelog b/debian/changelog
index fdf912c83b95acb2acec5ce57c29c5cfaba7494a..3a10749c26cb647690f4c8f488b4614fc33f41c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.32-1) UNRELEASED; urgency=low
+dcpomatic (1.69.33-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -156,8 +156,9 @@ dcpomatic (1.69.32-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 21 Jun 2014 14:59:59 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 21 Jun 2014 19:09:14 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 0f780b0826ae2fa627c8f6b10e7317936b5a1ed6..d35d03758b902e9a621efdbbd6d3c3084c7cc1d3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.32devel'
+VERSION = '1.69.33devel'
 
 def options(opt):
     opt.load('compiler_cxx')