Merge.
authorCarl Hetherington <cth@carlh.net>
Wed, 6 Jan 2016 11:06:37 +0000 (11:06 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 6 Jan 2016 11:06:37 +0000 (11:06 +0000)
commitc55877926307d7018942beb5fd65a39f278e05de
tree32b35ad6fd0330d74323bb9f86d517d5958ae880
parentde752b7e2917563469414871f7fd1a064db01822
parent5d3c57b08d3064df908d8a497d9616ffb6eb44cd
Merge.
ChangeLog
cscript
src/wx/about_dialog.cc