Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 9 Sep 2014 21:48:20 +0000 (22:48 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 9 Sep 2014 21:48:20 +0000 (22:48 +0100)
commite80e6a8567dd107f5ea3b708975cb5fd92112a57
treeb477abc29daa6d9dadfc3a2fa8e950c00643a6a4
parent6b05486d6d8a099c0623da2b84fb1478e842d8d5
parent890cf574a7a82906fbc1086a17a6e9c514c61679
Merge remote-tracking branch 'origin/master' into 2.0
src/wx/about_dialog.cc