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 5aa58f5ea..356ac12ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-12-30  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.54 released.
+
+2013-12-30  Carl Hetherington  <cth@carlh.net>
+
 	* Put catches around a few threads which could have uncaught exceptions.
 
 	* Add nascent dcpomatic_create command-line program to create films.
diff --git a/debian/changelog b/debian/changelog
index 0407aa624..ace63a137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.53-1) UNRELEASED; urgency=low
+dcpomatic (1.54-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -57,8 +57,9 @@ dcpomatic (1.53-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 29 Dec 2013 01:13:24 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 30 Dec 2013 23:59:40 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 2b55cfd38..129cfb591 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.54pre'
+VERSION = '1.55pre'
 
 def options(opt):
     opt.load('compiler_cxx')