Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / src / wx / about_dialog.cc

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index d4a8b2113b9d9adb1338b1594f58e3894e0d5e3b..2c84b7e35665d050d66f86ee403b9754f17e1a42 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
        t = new wxStaticText (
                this, wxID_ANY,
-               _("(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis,\n Ole Laursen, Brecht Sanders"),
+               _("(C) 2012-2015 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
                wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
                );
        
@@ -90,7 +90,6 @@ AboutDialog::AboutDialog (wxWindow* parent)
        wxArrayString written_by;
        written_by.Add (wxT ("Carl Hetherington"));
        written_by.Add (wxT ("Terrence Meiczinger"));
-       written_by.Add (wxT ("Paul Davis"));
        written_by.Add (wxT ("Ole Laursen"));
        written_by.Add (wxT ("Brecht Sanders"));
        add_section (_("Written by"), written_by);
@@ -119,6 +118,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Manual AC"));
        supported_by.Add (wxT ("Kambiz Afshar"));
        supported_by.Add (wxT ("Alex Asp"));
+       supported_by.Add (wxT ("Eric Audurier"));
        supported_by.Add (wxT ("Louis Belloisy"));
        supported_by.Add (wxT ("Mike Blakesley"));
        supported_by.Add (wxT ("Jeff Boot"));
@@ -131,10 +131,12 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Alexey Derevyanko"));
        supported_by.Add (wxT ("Unwana Essien"));
        supported_by.Add (wxT ("Maxime Estoppey"));
+       supported_by.Add (wxT ("Jose Angel Velasco Fernandez"));
        supported_by.Add (wxT ("Andres Fink"));
        supported_by.Add (wxT ("Evan Freeze"));
        supported_by.Add (wxT ("Silvio Giuliano"));
        supported_by.Add (wxT ("Alan Gouger"));
+       supported_by.Add (wxT ("Christopher Gray"));
        supported_by.Add (wxT ("Flor Guillaume"));
        supported_by.Add (wxT ("Patrick Haderer"));
        supported_by.Add (wxT ("Antonio Ruiz Hernandez"));
@@ -157,6 +159,8 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Гуляев Михаил"));
        supported_by.Add (wxT ("David Nedrow"));
        supported_by.Add (wxT ("Tim O'Brien"));
+       supported_by.Add (wxT ("Jerome Cohen Olivar"));
+       supported_by.Add (wxT ("Rui Pereira"));
        supported_by.Add (wxT ("Ivan Pullman"));
        supported_by.Add (wxT ("Mark Rolfe"));
        supported_by.Add (wxT ("David Rozenthal"));
@@ -166,8 +170,13 @@ 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"));
        supported_by.Add (wxT ("Wolfgang Woehl"));
        supported_by.Add (wxT ("Wolfram Weber"));
+       supported_by.Add (wxT ("Johannes Wilbrand"));
        supported_by.Add (wxT ("Frank de Wulf"));
        supported_by.Add (wxT ("Pavel Zhdanko"));
        supported_by.Add (wxT ("Daniel Židek"));
@@ -182,6 +191,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Adam Colt"));
        tested_by.Add (wxT ("John Convertino"));
        tested_by.Add (wxT ("Andreas Eli"));
+       tested_by.Add (wxT ("Jose Angel Velasco Fernandez"));
        tested_by.Add (wxT ("Maurizio Giampà"));
        tested_by.Add (wxT ("Luke Granger-Brown"));
        tested_by.Add (wxT ("Sumit Guha"));