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)
1  2 
src/wx/about_dialog.cc

Simple merge