Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Sep 2014 14:44:24 +0000 (15:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Sep 2014 14:44:24 +0000 (15:44 +0100)
commitf4030653da8f5a0b3daebe640f485b3daf9ef091
tree88c2780c466d326bdb41db4d5c49699eb7abc2fe
parent8acd8bd6fe321bfb848c16e9357991bc1fad87a9
parent1deb6103acac71dd2b6da5b95dc25bea053ffc8b
Merge remote-tracking branch 'origin/master' into 2.0
src/wx/config_dialog.cc