Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 607f718ee..165eb6915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-01-03  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.55 released.
+
+2014-01-03  Carl Hetherington  <cth@carlh.net>
+
 	* New de_DE translation from Markus Raab.
 
 	* Work-around mysterious call of pure virtual method inside boost.
diff --git a/debian/changelog b/debian/changelog
index ace63a137..8aae8e7a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.54-1) UNRELEASED; urgency=low
+dcpomatic (1.55-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -58,8 +58,9 @@ dcpomatic (1.54-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 30 Dec 2013 23:59:40 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 03 Jan 2014 14:37:06 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 129cfb591..bd9b52339 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.55pre'
+VERSION = '1.56pre'
 
 def options(opt):
     opt.load('compiler_cxx')