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.

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
..
bsa_file.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	10 years ago
bsa_file.hpp	Add virtual file system (VFS) replacing the low level parts of the old resource system	10 years ago