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		2015-03-27 17:30:48 +01:00
..
tests
base.hpp
controlled.cpp
controlled.hpp
controller.cpp
controller.hpp
data.cpp
data.hpp
effect.cpp
effect.hpp
extra.cpp
extra.hpp
niffile.cpp
niffile.hpp
nifkey.hpp
nifstream.cpp
nifstream.hpp
niftypes.hpp
node.cpp
node.hpp
property.cpp
property.hpp
record.hpp
recordptr.hpp