diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-02-16 15:54:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-02-16 15:54:43 +0000 |
| commit | 084747da78b238fe8df8f6c6505b9e433431be5b (patch) | |
| tree | 09c03be72434d31687d8695fc2aad1ed6e3937c0 | |
| parent | 371837932bc4f1a76bc49cd0fabbe6c2ad0a74dd (diff) | |
| parent | 40e334d001eabaf61e7eeff0c5dc788c780b8906 (diff) | |
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
| -rw-r--r-- | TO_PORT | 1 | ||||
| -rw-r--r-- | src/tools/dcpomatic.cc | 2 | ||||
| -rw-r--r-- | src/wx/about_dialog.cc | 1 |
3 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,5 @@ e6c9d208c52fb6f8bc29469e7d263bd03b22fe48 31894d178c8f6a3378b1c25c7ea1971f78759156 +bb2bdf010dd2ea813f9ac7af5023ce39cf14f572 c065accc4b4c6ed268e7fccea77a958473be7785 e30fd8d diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 21cd10c26..19f2861c4 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -676,7 +676,7 @@ private: add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); wxMenu* tools = new wxMenu; - add_item (tools, _("Hints...\tCtrl-H"), ID_tools_hints, 0); + add_item (tools, _("Hints..."), ID_tools_hints, 0); add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0); add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0); diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 453179180..d110ac3fd 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -169,6 +169,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Mike Stiebing")); supported_by.Add (wxT ("Randy Stankey")); supported_by.Add (wxT ("Bruce Taylor")); + supported_by.Add (wxT ("Lawrence Towers")); supported_by.Add (wxT ("Richard Turner")); supported_by.Add (wxT ("Frank Wenz")); supported_by.Add (wxT ("Roland Wirtz")); |