Jan Dalheimer 3cd2b898e5 Merge remote-tracking branch 'origin/develop' into feature_cmake_style ...

Conflicts:
	CMakeLists.txt

2014-04-07 17:44:52 +02:00

..

CMakeLists.txt

Merge remote-tracking branch 'origin/develop' into feature_cmake_style

2014-04-07 17:44:52 +02:00

inifile.cpp

Fix issues with badly encoded escape sequences in config files.

2014-03-29 21:16:54 +01:00

inifile.h

Fix issues with badly encoded escape sequences in config files.

2014-03-29 21:16:54 +01:00

inisettingsobject.cpp

…

inisettingsobject.h

…

libsettings_config.h

…

overridesetting.cpp

…

overridesetting.h

…

setting.cpp

…

setting.h

…

settingsobject.cpp

…

settingsobject.h

…