scrawl 5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwscript/miscextensions.cpp		2012-12-11 22:28:23 +01:00
..
vmformat.txt	Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback	2012-12-11 22:28:23 +01:00