Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 30 Sep 2014 19:40:31 +0000 (20:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 30 Sep 2014 19:40:31 +0000 (20:40 +0100)
commit3b48d5494c3cae7743d283203f5c8021860ab81f
tree3a6e2a91a72d356c39013874b01b0a3cc6f0e3a8
parentd4fe6a59e2f253c19d661fa8136bda38e855f55c
parent1a2fe60d121b1a01f13e67563578cfcccfb4f1d3
Merge remote-tracking branch 'origin/master' into 2.0
src/wx/about_dialog.cc