Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 13:30:02 +0000 (14:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 13:30:02 +0000 (14:30 +0100)
commit94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1
treed915d31c0b13f7201e3bc62a66fec150baa9ddf8
parent2154e7c39166cfc4b128545d94a5698c7d70daea
parent5d06efadc0cc88c38a3ab3a44ef676f89ae2e43c
Merge remote-tracking branch 'origin/master' into 2.0
ChangeLog
src/lib/config.cc
src/lib/config.h
src/lib/kdm.cc
src/wx/config_dialog.cc