3cd2b898e5
Conflicts: CMakeLists.txt |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
inifile.cpp | ||
inifile.h | ||
inisettingsobject.cpp | ||
inisettingsobject.h | ||
libsettings_config.h | ||
overridesetting.cpp | ||
overridesetting.h | ||
setting.cpp | ||
setting.h | ||
settingsobject.cpp | ||
settingsobject.h |