scrawl 118250171d Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders ... Conflicts: apps/openmw/mwrender/objects.cpp		2012-03-13 17:31:10 +01: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' of https://github.com/zinnschlag/openmw into shaders	2012-03-13 17:31:10 +01:00
ogre_nif_loader.hpp	Merging in master	2012-02-19 15:39:12 -05:00