You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3mp/components/nifogre
scrawl 0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
12 years ago
..
tests Mostly removal of unnecessary #include's and a little clean up 13 years ago
ogre_nif_loader.cpp Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
ogre_nif_loader.hpp Avoid duplicating skeletons due to casing issues 12 years ago