Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 6 Aug 2014 14:37:57 +0000 (15:37 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 6 Aug 2014 14:37:57 +0000 (15:37 +0100)
commit04eebe07e2f64bd15f6887a10ab51fb92c52901a
tree2004680de019a5871dd1c2bb5858ed9451232537
parentd8bce8328bd6e069cb9a69e7316100381eac0545
parent97a1a713078f151d1b68b6f256a5b885e7733a92
Merge master.
ChangeLog
cscript
src/lib/config.cc
src/lib/config.h
src/lib/kdm.cc
src/wx/about_dialog.cc
src/wx/config_dialog.cc