Chris Robinson 6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup ...

Conflicts:
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/animation.hpp
	apps/openmw/mwrender/creatureanimation.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
	components/nifogre/ogre_nif_loader.hpp

2012-07-17 10:57:15 -07:00

..

mangle

Changed standard C lib includes to C++ format

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

openengine

Merge remote branch 'zini/master' into nif-cleanup

2012-07-17 10:57:15 -07:00

platform

removed tabs

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