Nikolay Kasyanov 523648dbb1 Merge branch 'master' into pgrd-rendering ...

Conflicts:
	apps/openmw/mwrender/debugging.cpp

2012-03-31 14:56:18 +04:00

..

tests

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

2011-06-19 16:46:34 +02:00

bsa_archive.cpp

Merge branch 'master' into pgrd-rendering

2012-03-31 14:56:18 +04:00

bsa_archive.hpp

Merge branch 'components_namespaces' into next

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

bsa_file.cpp

ogre 1.8 fixes

2012-03-28 21:30:59 +02:00

bsa_file.hpp

ogre 1.8 fixes

2012-03-28 21:30:59 +02:00