Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 22 Jun 2014 20:11:18 +0000 (21:11 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 22 Jun 2014 20:11:18 +0000 (21:11 +0100)
commitf0edd6ab35c3c2b7800a26ec8206adab75e5f633
treeaad6fc8ca2d932bcc630254e339fd648d8a10f50
parent6d26c4afe1e2b63d346d311ceffe41bf8cb62572
parent14b1f672dc92ae8e1385c75e30420a4dcb4e32c9
Merge master.
ChangeLog
cscript
src/wx/about_dialog.cc
src/wx/audio_panel.cc
src/wx/config_dialog.cc
src/wx/screen_dialog.cc
src/wx/timing_panel.cc
src/wx/wx_util.cc
wscript