Marc Zinnschlag f9d2fde783 Merge branch 'openmw-29' ... Conflicts: apps/openmw/mwmechanics/aicombat.cpp		2014-03-04 09:34:38 +01: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 branch 'openmw-29'	2014-03-04 09:34:38 +01:00
statemanagerimp.hpp	load and save of reference in cells (without CustomData state)	2014-01-27 13:27:42 +01:00