AnyOldName3 8fc09f8c51 Merge remote-tracking branch 'upstream/master' into detain-hash-selectively-reluctant ... 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.		2021-12-09 17:09:52 +00:00
..
androidpath.cpp
androidpath.hpp
collections.cpp
collections.hpp
configfileparser.cpp
configfileparser.hpp
configurationmanager.cpp	Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89062	2021-11-29 20:16:49 +00:00
configurationmanager.hpp	Remove redundant conversion operator	2021-11-28 20:33:17 +00:00
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