Marc Zinnschlag 8446619ac4 Merge branch 'components_namespaces' into next ...

Conflicts:
	apps/openmw/mwrender/interior.cpp
	components/bsa/bsa_archive.cpp

2011-06-19 20:22:29 +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 branch 'components_namespaces' into next

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

ogre_nif_loader.hpp

Merge branch 'components_namespaces' into next

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