Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp		2012-11-10 15:44:44 +01:00
..
dialoguemanager.hpp	Merge branch 'master' into dialogue	2012-11-10 15:44:44 +01:00
environment.cpp
environment.hpp
inputmanager.hpp
journal.hpp
mechanicsmanager.hpp	Merge remote-tracking branch 'scrawl/persuasion' into next	2012-11-10 14:59:52 +01:00
scriptmanager.hpp
soundmanager.hpp
windowmanager.hpp
world.hpp