Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 18fb4da97..5f8d4cafd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-09-05  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.1.54 released.
+
+2015-09-05  Carl Hetherington  <cth@carlh.net>
+
 	* Version 2.1.53 released.
 
 2015-09-04  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 7bcffb18c..17b7e995c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.1.53-1) UNRELEASED; urgency=low
+dcpomatic (2.1.54-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -284,8 +284,9 @@ dcpomatic (2.1.53-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 05 Sep 2015 00:52:35 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 05 Sep 2015 23:22:10 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 8bb327ba2..8a5066617 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.53devel'
+VERSION = '2.1.54devel'
 
 def options(opt):
     opt.load('compiler_cxx')