Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ef32e1806..17ffca966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-01-15  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.0.33 released.
+
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
 	* Version 2.0.32 released.
 
 2015-01-15  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index b7103c275..a0f55e2d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.32-1) UNRELEASED; urgency=low
+dcpomatic (2.0.33-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -211,8 +211,9 @@ dcpomatic (2.0.32-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 15 Jan 2015 10:11:28 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 15 Jan 2015 11:36:01 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 5a8da54fe..06059fb41 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.32devel'
+VERSION = '2.0.33devel'
 
 def options(opt):
     opt.load('compiler_cxx')