Marc Zinnschlag afa859a6a6 Merge remote branch 'jhooks/clothingarmor' ...

Conflicts:
	apps/openmw/mwrender/npcanimation.cpp

2012-04-15 22:06:05 +02:00

..

tests

Mantis: #18 - Move components from global namespace into their own namespace.

2011-06-19 19:14:14 +02:00

ogre_nif_loader.cpp

Merge remote branch 'jhooks/clothingarmor'

2012-04-15 22:06:05 +02:00

ogre_nif_loader.hpp

Merging in master

2012-02-19 15:39:12 -05:00