Marc Zinnschlag 273eac12a1 Merge remote branch 'jhooks/animation2' into animation2 ... Conflicts: apps/openmw/mwrender/npcanimation.cpp components/nifogre/ogre_nif_loader.cpp		2012-02-12 13:41:06 +01: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/animation2' into animation2	2012-02-12 13:41:06 +01:00
ogre_nif_loader.hpp	clean up	2012-01-17 15:10:53 +01:00