Pieter van der Kloet ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext ... Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp apps/launcher/datafilespage.hpp apps/launcher/graphicspage.cpp components/fileorderlist/utils/filedialog.cpp components/fileorderlist/utils/filedialog.hpp		2013-02-15 15:21:14 +01:00
..
gamesettings.cpp	WIP: working on improving the config file handling	2013-02-11 15:01:00 +01:00
gamesettings.hpp	Implemented data/data-local support and added settingshandlers to main.cpp	2013-01-26 18:19:04 +01:00
graphicssettings.cpp	Added settings file reader/writers for openmw.cfg and settings.cfg	2013-01-25 05:19:06 +01:00
graphicssettings.hpp	Merge remote-tracking branch 'upstream/next' into settingsnext	2013-02-15 15:21:14 +01:00
launchersettings.cpp	More work on integrating the settings parser, profiles are handled correctly	2013-02-15 01:20:48 +01:00
launchersettings.hpp	Merge remote-tracking branch 'upstream/next' into settingsnext	2013-02-15 15:21:14 +01:00
settingsbase.hpp	More work on integrating the settings parser, profiles are handled correctly	2013-02-15 01:20:48 +01:00