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
..
2013-08-27 15:48:13 +02:00
2013-08-27 15:48:13 +02:00
2013-08-29 17:14:25 +02:00
2013-08-19 20:34:20 +02:00
2013-07-31 18:46:32 +02:00