scrawl f8d6a36196 Merge branch 'master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/sky.cpp apps/openmw/mwrender/sky.hpp components/nifogre/ogre_nif_loader.cpp components/nifogre/ogre_nif_loader.hpp		2012-07-23 15:35:31 +02:00
..
shiny@73ddc737ce	Merge branch 'master' into nif-cleanup	2012-07-23 15:35:31 +02:00