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-tes3coop/components
Chris Robinson 6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/animation.hpp
	apps/openmw/mwrender/creatureanimation.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
	components/nifogre/ogre_nif_loader.hpp
13 years ago
..
bsa Merge remote branch 'zini/master' into nif-cleanup 13 years ago
compiler Mostly removal of unnecessary #include's and a little clean up 13 years ago
esm Merge branch 'master' into potions 13 years ago
esm_store Merge branch 'master' into potions 13 years ago
file_finder Issue #133 Handle resources across multiple data directories 13 years ago
files Mostly removal of unnecessary #include's and a little clean up 13 years ago
interpreter Issue #181: assignment to member variables 13 years ago
misc Changed standard C lib includes to C++ format 13 years ago
nif Merge remote branch 'zini/master' into nif-cleanup 13 years ago
nifbullet Merge remote branch 'zini/master' into nif-cleanup 13 years ago
nifogre Merge remote branch 'zini/master' into nif-cleanup 13 years ago
nifoverrides override nif transparency settings (part 1) 13 years ago
settings fix some settings bugs 13 years ago
terrain Changed standard C lib includes to C++ format 13 years ago
to_utf8 Changed standard C lib includes to C++ format 13 years ago
CMakeLists.txt fix link error with recent glibc versions 13 years ago
doc.hpp second set of additional doxygen comments 14 years ago