Merge branch '1.0' into 1.0-seek

diff --git a/ChangeLog b/ChangeLog
index 5aa58f5ea77149870f510ff1290cb613cc96d618..356ac12eff4a766056f23f7973f0eaeab1800513 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/debian/changelog b/debian/changelog
index 0407aa62460898debd3a59ffe06833527f045921..ace63a137f0fff4c8215c7346274727d93b59393 100644 (file)
--- 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/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 0d5ae7fd65edfa087f07682ceb11e1253eaee94c..d4a06a2c5697c176602079fbe468dd39bcdd6197 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -75,7 +75,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
        t = new wxStaticText (
                this, wxID_ANY,
-               _("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"),
+               _("(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"),
                wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
                );
        
@@ -126,6 +126,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Frank Cianciolo"));
        supported_by.Add (wxT ("Rodolfo Giuliano"));
        supported_by.Add (wxT ("Sylvain Mielle"));
+       supported_by.Add (wxT ("Ivan Pullman"));
        add_section (_("Supported by"), supported_by);
 
        sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());

diff --git a/wscript b/wscript
index 2b55cfd382578e22d1952be54ff3b76cb98aa475..129cfb591d357d47d6c10ed51c2787e5c7b6b28f 100644 (file)
--- 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')