summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive/libarchive/xxhash.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-07-201-3/+9
| | | | | * upstream-LibArchive: LibArchive 2017-07-09 (98a69539)
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-02-201-3/+3
| | | | | * upstream-LibArchive: LibArchive 2017-02-19 (100ee75a)
* libarchive: Fix include order in xxhash.cBrad King2016-08-171-2/+3
| | | | | We need to include `archive_platform.h` before any system headers in order to ensure that `_WIN32_WINNT` is defined early enough.
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-05-021-3/+17
| | | | | Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.
* Fix spelling typos in comments and documentation (#16037)Felix Geyer2016-03-291-1/+1
| | | | | The Debian package checker tool (lintian) detected several typos in CMake.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2015-10-211-0/+500
Resolve conflicts by integrating changes from both sides.