summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-12-04 21:14:33 +0000
committerCarl Hetherington <cth@carlh.net>2017-12-04 21:14:33 +0000
commitd42f7f8e05b33876e45bcc6b58b736f0c2cbfa2f (patch)
tree8b4786d84fb732f3ef6ce8e7b905fce4e861394b
parentfe413f8f083338607af12f6c22344f1420b116d4 (diff)
parent9cad6a1ea3eb15e7c118ac012953fb6d225625fb (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
-rw-r--r--src/wx/about_dialog.cc1
m---------test/data0
2 files changed, 1 insertions, 0 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 6cfa37823..2c5b2ee38 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -183,6 +183,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
supported_by.Add (wxT ("Brett Friedman"));
supported_by.Add (wxT ("Stephen Furley"));
supported_by.Add (wxT ("filmtechniek.nl"));
+ supported_by.Add (wxT ("Peter Gara"));
supported_by.Add (wxT ("Jose Delio Ares Garcia"));
supported_by.Add (wxT ("Gartenbaukino"));
supported_by.Add (wxT ("Silvio Giuliano"));
diff --git a/test/data b/test/data
-Subproject cfcc6d6e4e145614460a6c4194d7a9f88cd7b85
+Subproject ee1faf097bdfa42848ca51e1c195f4c9ac66023