Marc Zinnschlag c251fbdf23 Merge branch 'master' into HEAD ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt libs/openengine/ogre/renderer.cpp		2012-08-02 14:57:35 +02:00
..
vmformat.txt	Merge branch 'master' into HEAD	2012-08-02 14:57:35 +02:00