Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 2 Oct 2014 23:07:54 +0000 (00:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 2 Oct 2014 23:07:54 +0000 (00:07 +0100)
commitc6c082c4a8016f85ba4207f4b8ccee1d5770e4a4
tree6c72688c436c2c321dfc6435a11fbf3ff11ddc2e
parent938d3cde87a1958513bc1e98d2285dda1e960055
parent5ab303bbd36982dad1a35243256f1e7099775982
Merge remote-tracking branch 'origin/master' into 2.0
src/wx/about_dialog.cc