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
..
androidpath.cpp
androidpath.h
androidpath.hpp
collections.cpp
collections.hpp
configurationmanager.cpp
configurationmanager.hpp
constrainedfilestream.cpp
constrainedfilestream.hpp
fixedpath.hpp
linuxpath.cpp
linuxpath.hpp
lowlevelfile.cpp
lowlevelfile.hpp
macospath.cpp
macospath.hpp
multidircollection.cpp
multidircollection.hpp
windowspath.cpp
windowspath.hpp