Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame ...

Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg

2013-12-07 12:27:06 +01:00

..

doc

Merge branch 'master' into savedgame

2013-12-07 12:27:06 +01:00

filter

Various fixes for CppCheck warnings.

2013-12-06 07:36:16 +01:00

settings

Various fixes for CppCheck warnings.

2013-12-06 07:36:16 +01:00

tools

Merge branch 'dialogue' into saving

2013-10-21 16:45:43 +02:00

world

added overloaded start/endRecord functions to ESMWriter

2013-12-01 13:32:11 +01:00