Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-LibArchive' into update-libarchive | Brad King | 2018-09-26 | 1 | -3/+3 |
| | | | | | * upstream-LibArchive: LibArchive 2018-09-03 (5fe69dd0) | ||||
* | Merge branch 'libarchive-upstream' into update-libarchive | Brad King | 2013-07-31 | 1 | -0/+227 |
Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive.h Utilities/cmlibarchive/libarchive/archive_entry.h Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c Utilities/cmlibarchive/libarchive/archive_windows.h Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c |