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

..

test

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

2011-06-19 18:45:23 +02:00

bullet_nif_loader.cpp

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

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

bullet_nif_loader.hpp

Mostly removal of unnecessary #include's and a little clean up

2012-07-17 09:27:12 +02:00