Merge.

diff --git a/TO_PORT b/TO_PORT
index 0abec4227759cb198df10e1d9c46941740ac9182..29155e0218a60d141b1746c5606c5b9359c74520 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,3 +1,4 @@
 e6c9d208c52fb6f8bc29469e7d263bd03b22fe48
 31894d178c8f6a3378b1c25c7ea1971f78759156
+bb2bdf010dd2ea813f9ac7af5023ce39cf14f572
 c065accc4b4c6ed268e7fccea77a958473be7785

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 4531791807c44ce495042701ee847149606574dd..d110ac3fd0dbf741c822914a79ae8e7970025277 100644 (file)
--- 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"));