Brad King
|
e9bc469b2a
|
Merge branch 'upstream-LibArchive' into update-libarchive
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
|
2016-05-02 10:48:48 -04:00 |
|
Brad King
|
932848f420
|
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts by integrating changes from both sides.
|
2015-10-21 10:18:52 -04:00 |
Ruslan Baratov
|
9e41eb68ec
|
Fix wording of "the the" typos throughout text
|
2014-01-03 11:35:32 -05:00 |
|
Brad King
|
102071f80c
|
Merge branch 'libarchive-upstream' into update-libarchive
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
|
2013-07-31 08:19:13 -04:00 |
|
Brad King
|
156cb3bbf2
|
Merge branch 'libarchive-upstream' into update-libarchive
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive_windows.c
|
2012-01-05 09:02:58 -05:00 |
|
Brad King
|
3e5a80f063
|
Merge branch 'libarchive-upstream' into update-libarchive
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
|
2011-12-20 11:54:25 -05:00 |