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	fix WindowManager destruction	2012-08-12 21:21:23 +02:00
environment.hpp	Issue #107: WindowManager is accessed only through the interface class from now on	2012-08-12 18:11:09 +02:00
inputmanager.hpp	loading screen	2012-09-11 16:37:54 +02:00
journal.hpp	MSCV compatibility fix	2012-08-11 12:03:22 +02:00
mechanicsmanager.hpp	Merge remote-tracking branch 'scrawl/persuasion' into next	2012-11-10 14:59:52 +01:00
scriptmanager.hpp	Issue #107: minor corrections	2012-08-09 12:05:47 +02:00
soundmanager.hpp	disabling gcc extensions	2012-10-09 17:10:25 +02:00
windowmanager.hpp	Merge branch 'Travel_Dialogue' into training_travel	2012-10-17 18:17:53 +02:00
world.hpp	minor doxygen comments update	2012-11-08 19:01:42 +04:00