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

..

dialoguemanagerimp.cpp

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

dialoguemanagerimp.hpp

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

filter.cpp

Issue #219: more DialogueManager refactoring

2012-11-10 14:52:44 +01:00

filter.hpp

Issue #219: more DialogueManager refactoring

2012-11-10 14:52:44 +01:00

journalentry.cpp

new interface in manualref, fix various typos

2012-11-06 13:43:48 +04:00

journalentry.hpp

move ESMStore to MWWorld

2012-11-05 17:18:01 +04:00

journalimp.cpp

move ESMStore to MWWorld

2012-11-05 17:18:01 +04:00

journalimp.hpp

fixes some include guards

2012-08-11 12:02:51 +02:00

quest.cpp

applying new interface vol.3, inconsistent

2012-11-05 21:45:35 +04:00

quest.hpp

fixes some include guards

2012-08-11 12:02:51 +02:00

selectwrapper.cpp

Issue #219: added filters for various player stats

2012-11-10 14:02:52 +01:00

selectwrapper.hpp

Issue #219: added filters for various player stats

2012-11-10 14:02:52 +01:00

topic.cpp

move ESMStore to MWWorld

2012-11-05 17:18:01 +04:00

topic.hpp

fixes some include guards

2012-08-11 12:02:51 +02:00