gus d587f3c946 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwscript/docs/vmformat.txt		2013-10-31 09:51:17 +01:00
..
vmformat.txt	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat	2013-10-31 09:51:17 +01:00