| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2017-07-09 (98a69539)
|
|
|
|
|
| |
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
|
|
|
|
| |
Resolve conflicts by integrating changes from both sides.
|
|
|
|
|
|
| |
Resolve conflicts in favor of the upstream side where possible.
Resolve a logical conflict in archive_windows.h where the upstream
port to Watcom was done slightly differently from ours.
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive_windows.c
|
|
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
|