Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 16:10:47 +0000 (17:10 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 16:10:47 +0000 (17:10 +0100)
commit40b654453c2ce0b266f43c36f1b9a5d1705f983c
tree061a8a6c655253334fcb7f5634fdcef0b98b1040
parent1f82930e73679d6aec5223caa255f564339a1a2a
parentc96637d181be25d58fb6935236e22cb1d6d10b3f
Merge master.
src/wx/kdm_dialog.cc