graffy76 9ce4a04a2d merge from saving ... Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector Conflicts: apps/launcher/datafilespage.cpp apps/opencs/editor.cpp apps/opencs/view/doc/filedialog.cpp apps/opencs/view/doc/filedialog.hpp		2013-10-25 14:44:22 -05:00
..
gamesettings.cpp	merge from saving	2013-10-25 14:44:22 -05:00
gamesettings.hpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
graphicssettings.cpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
graphicssettings.hpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
launchersettings.cpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
launchersettings.hpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
settingsbase.hpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00