Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 10:14:54 +0000 (11:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 10:14:54 +0000 (11:14 +0100)
commit9e4c091e6ef0f79fab10664e95240de2f14e5702
tree0929399880e571b1ac4e30abd286958fb0a67361
parentea8c3dca0730a3e50a7b2788a4b79c4b521cef4b
parent5598e0dfbae48463130323c6a3bcd3eb9683f21e
Merge master.
ChangeLog
cscript
platform/windows/wscript
src/lib/wscript
src/wx/about_dialog.cc
src/wx/kdm_dialog.cc
src/wx/wscript
wscript