Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 22 Sep 2014 22:05:15 +0000 (23:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 22 Sep 2014 22:05:15 +0000 (23:05 +0100)
commitb56bc3c45953fe113a9934b0d2ec2c1134de07ab
treed924207307d55c1d9392c070c51196f0fbd6a0f0
parent93918888f9844de52b03385911791d37ccb53a3d
parent66e026c882f888759bc8090bb2ea2979a201b1dc
Merge remote-tracking branch 'origin/master' into 2.0
src/wx/about_dialog.cc