Orochimarufan e4f86893a8 fix merge issues, make console window work again

2013-03-22 14:40:55 +01:00

..

basicsettingsobject.h

…

inifile.h

…

inisettingsobject.h

…

keyring.h

fix merge issues, make console window work again

2013-03-22 14:40:55 +01:00

libsettings_config.h

…

overridesetting.h

…

setting.h

…

settingsobject.h

…