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

..

mangle

Changed standard C lib includes to C++ format

2012-07-17 09:44:24 +02:00

openengine

Merge branch 'master' into HEAD

2012-08-02 14:57:35 +02:00

platform

removed tabs

2012-03-02 14:18:10 +04:00