scrawl a5ef669eb6 Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD ... Conflicts: apps/openmw/mwscript/aiextensions.cpp apps/openmw/mwscript/docs/vmformat.txt		2013-01-03 02:34:31 +01:00
..
vmformat.txt	Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD	2013-01-03 02:34:31 +01:00