scrawl 3cdbcf3c28 Merge branch 'actorid' of https://github.com/OpenMW/openmw ... Conflicts: apps/openmw/mwmechanics/creaturestats.cpp		2014-05-14 02:35:05 +02:00
..
character.cpp	Allow to delete savegames (shift + click)	2014-04-28 20:57:45 +02:00
character.hpp	Allow to delete savegames (shift + click)	2014-04-28 20:57:45 +02:00
charactermanager.cpp	Allow to delete savegames (shift + click)	2014-04-28 20:57:45 +02:00
charactermanager.hpp	Allow to delete savegames (shift + click)	2014-04-28 20:57:45 +02:00
statemanagerimp.cpp	Merge branch 'actorid' of https://github.com/OpenMW/openmw	2014-05-14 02:35:05 +02:00
statemanagerimp.hpp	Allow to delete savegames (shift + click)	2014-04-28 20:57:45 +02:00