Marc Zinnschlag 1f6ed584c2 Merge remote-tracking branch 'digmaster/master' ... Conflicts: apps/openmw/mwstate/statemanagerimp.cpp		2014-04-25 08:39:40 +02:00
..
character.cpp	case fix (content file names)	2013-11-25 14:56:05 +01:00
character.hpp	store content file list in saved games and reject saved games not matching the current game	2013-11-25 13:00:05 +01:00
charactermanager.cpp	store content file list in saved games and reject saved games not matching the current game	2013-11-25 13:00:05 +01:00
charactermanager.hpp	store content file list in saved games and reject saved games not matching the current game	2013-11-25 13:00:05 +01:00
statemanagerimp.cpp	Merge remote-tracking branch 'digmaster/master'	2014-04-25 08:39:40 +02:00
statemanagerimp.hpp	Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait.	2014-04-24 03:14:47 -04:00