Marc Zinnschlag afa859a6a6 Merge remote branch 'jhooks/clothingarmor' ... Conflicts: apps/openmw/mwrender/npcanimation.cpp		2012-04-15 22:06:05 +02:00
..
tests
ogre_nif_loader.cpp	Merge remote branch 'jhooks/clothingarmor'	2012-04-15 22:06:05 +02:00
ogre_nif_loader.hpp