diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-01 18:17:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-01 18:17:59 +0000 |
| commit | d2926ea8574330b9c7f4efa4241843cf052652b8 (patch) | |
| tree | b56f612cf69ce9be907c1157c58dc606ac1d0615 | |
| parent | b9567ce4b9212c3ed386592d318eea0e639472c0 (diff) | |
| parent | 7dedacfb85b10cdf0f5697ea1d0fe8cc5cf8379e (diff) | |
Merge branch '1.0' into 1.0-seek
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | src/wx/about_dialog.cc | 3 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -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/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 0d5ae7fd6..d4a06a2c5 100644 --- 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()); @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.54pre' +VERSION = '1.55pre' def options(opt): opt.load('compiler_cxx') |