mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-03 17:37:18 +00:00
8fc09f8c51
Merge conflicts included: * One setting being removed (branch had changed its type). * One setting's description being changed (branch had changed its type). * List of files in components/files was changed both upstream and on the branch. * Upstream had changed something in a file the branch deletes. |
||
---|---|---|
.. | ||
androidpath.cpp | ||
androidpath.hpp | ||
collections.cpp | ||
collections.hpp | ||
configfileparser.cpp | ||
configfileparser.hpp | ||
configurationmanager.cpp | ||
configurationmanager.hpp | ||
constrainedfilestream.cpp | ||
constrainedfilestream.hpp | ||
fixedpath.hpp | ||
hash.cpp | ||
hash.hpp | ||
linuxpath.cpp | ||
linuxpath.hpp | ||
lowlevelfile.cpp | ||
lowlevelfile.hpp | ||
macospath.cpp | ||
macospath.hpp | ||
memorystream.hpp | ||
multidircollection.cpp | ||
multidircollection.hpp | ||
windowspath.cpp | ||
windowspath.hpp |