scrawl f8d6a36196 Merge branch 'master' into nif-cleanup ...

Conflicts:
	apps/openmw/mwrender/sky.cpp
	apps/openmw/mwrender/sky.hpp
	components/nifogre/ogre_nif_loader.cpp
	components/nifogre/ogre_nif_loader.hpp

2012-07-23 15:35:31 +02:00

..

mangle

Changed standard C lib includes to C++ format

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

openengine

Merge branch 'master' into nif-cleanup

2012-07-23 15:35:31 +02:00

platform

removed tabs

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