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/apps/esmtool
scrawl 236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
10 years ago
..
.gitignore Moved esmtool to apps/ 15 years ago
CMakeLists.txt We don't need Carbon on OS X anymore 12 years ago
esmtool.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
labels.cpp Several warning fixes 10 years ago
labels.hpp Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell. 11 years ago
record.cpp Add travel service support for creatures (Fixes #2432) 10 years ago
record.hpp Several warning fixes 10 years ago