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

..

tests

Changed standard C lib includes to C++ format

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

bsa_archive.cpp

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

2012-07-15 12:04:43 -07:00

bsa_archive.hpp

Merge branch 'components_namespaces' into next

2011-06-19 20:22:29 +02:00

bsa_file.cpp

Changed standard C lib includes to C++ format

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

bsa_file.hpp

Remove outdated comment

2012-07-15 09:03:35 -07:00