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	Also reload the instance cfg	2014-03-09 08:43:08 +01:00
inisettingsobject.h	Also reload the instance cfg	2014-03-09 08:43:08 +01:00
libsettings_config.h	Allow the use of synonyms in settings. Refactor settings.	2014-01-01 15:10:35 +01:00
overridesetting.cpp	Allow the use of synonyms in settings. Refactor settings.	2014-01-01 15:10:35 +01:00
overridesetting.h	Allow the use of synonyms in settings. Refactor settings.	2014-01-01 15:10:35 +01:00
setting.cpp	Remove offending Settings constructor.	2014-01-01 15:30:26 +01:00
setting.h	Remove offending Settings constructor.	2014-01-01 15:30:26 +01:00
settingsobject.cpp	Also reload the instance cfg	2014-03-09 08:43:08 +01:00
settingsobject.h	Also reload the instance cfg	2014-03-09 08:43:08 +01:00