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 393e67147..bf61112da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-20  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.35 released.
+
 2015-01-20  c.hetherington  <cth@carlh.net>
 
 	* More informative error when failing to decode
diff --git a/debian/changelog b/debian/changelog
index a69ecce23..28d0195f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.34-1) UNRELEASED; urgency=low
+dcpomatic (2.0.35-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -213,8 +213,9 @@ dcpomatic (2.0.34-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 15 Jan 2015 16:49:22 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 20 Jan 2015 14:51:23 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 9f686f14e..f2c408075 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.34devel'
+VERSION = '2.0.35devel'
 
 def options(opt):
     opt.load('compiler_cxx')