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/apps
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
..
bsatool Several warning fixes 10 years ago
esmtool Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
essimporter fixing MSVC 2013 warning C4244: & C4305 10 years ago
launcher Merge remote-tracking branch 'dteviot/Bug2344' 10 years ago
mwiniimporter fix -Wnewline-eof warnings 10 years ago
nifosgtest Don't set the root node to dynamic 10 years ago
opencs Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
openmw Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
openmw_test_suite UnitTests: add another dialogue keyword test 10 years ago
wizard Installer work for Windows (Fixes #1621) 10 years ago
doc.hpp