summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive/libarchive/archive_xxhash.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2015-10-211-0/+47
Resolve conflicts by integrating changes from both sides.