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 19:14:14 +02:00

ogre_nif_loader.cpp

Merge branch 'master' into pgrd-rendering

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

ogre_nif_loader.hpp

Merging in master

2012-02-19 15:39:12 -05:00