1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
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-11-18 23:03:44 +01:00
2013-11-18 23:03:44 +01:00
2013-05-15 17:54:18 +02:00
2013-05-15 17:54:18 +02:00
2013-08-21 13:53:49 +02:00
2013-05-21 21:04:15 +02:00
2013-05-15 17:54:18 +02:00