Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 15 Oct 2014 08:34:46 +0000 (09:34 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 15 Oct 2014 08:34:46 +0000 (09:34 +0100)
commite491397c0028a80ac4a48a92007f783746553c1a
tree6cfabf78852e968323a1855c650b3b9c739b5334
parent12efbd5938f08eb445b43f539fa4f27aa5caccfb
parent60febebc55d25b5f60297d9f8c1b51fbda6bac63
Merge master.
ChangeLog
debian/changelog
src/wx/wx_util.cc