Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d3c935303..7445df54c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-21  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.33 released.
+
+2013-11-21  Carl Hetherington  <cth@carlh.net>
+
 	* Fix Ubuntu 13.04 build.
 
 2013-11-20  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 4810e81f5..3d37ca5ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.32-1) UNRELEASED; urgency=low
+dcpomatic (1.33-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -36,8 +36,9 @@ dcpomatic (1.32-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 20 Nov 2013 18:23:35 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 21 Nov 2013 18:56:59 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 138298d25..ec9eb5914 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.33pre'
+VERSION = '1.34pre'
 
 def options(opt):
     opt.load('compiler_cxx')