scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame ... Conflicts: apps/openmw/mwgui/referenceinterface.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwscript/cellextensions.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.cpp apps/openmw/mwworld/worldimp.cpp		2014-01-24 18:28:35 +01:00
..
dialoguemanager.hpp	Fix disposition changes from trades not applying properly	2014-01-08 01:46:42 +01:00
environment.cpp	Merge branch 'master' into HEAD	2014-01-06 00:23:17 +01:00
environment.hpp
inputmanager.hpp
journal.hpp	storing and loading the journal	2013-12-03 14:28:46 +01:00
mechanicsmanager.hpp	Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame	2014-01-24 18:28:35 +01:00
scriptmanager.hpp	globals script cleanup; fixed potential case folding bug	2013-12-12 13:15:38 +01:00
soundmanager.hpp	adding missing cleanup for SoundManager	2014-01-21 14:13:13 +01:00
statemanager.hpp	bug 428 ask to load recent saved game	2013-12-19 22:08:34 +02:00
windowmanager.hpp	Rewrite some awful code	2014-01-11 00:24:21 +01:00
world.hpp	Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame	2014-01-24 18:28:35 +01:00