1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 21:35:24 +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-08-09 05:14:58 -07:00
2013-08-09 05:14:58 -07:00
2013-09-27 13:56:40 +02:00
2013-09-27 13:56:40 +02:00
2013-11-11 12:21:26 +01:00
2013-11-16 14:44:31 +01:00
2013-09-15 15:00:15 +02:00
2013-12-03 13:51:44 +01:00
2013-03-22 05:50:54 +01:00
2013-03-04 14:32:23 +01:00