diff options
author | Brad King <brad.king@kitware.com> | 2020-02-13 09:30:35 -0500 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-02-13 12:57:52 -0500 |
commit | 5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd (patch) | |
tree | 3d39cf776650ac89bedec4fc1d251ff70e6fc8d7 /Utilities/cmlibarchive/libarchive/archive_write_format.3 | |
parent | 9a27ecd4162aebfb595b7a02b958b7dfb95256d8 (diff) | |
parent | 8cce62295a5ddca3e0d1fd7cff0229054972dfe3 (diff) | |
download | cmake-5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd.tar.gz |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2020-02-11 (3288ebb0)
Also manually restore content from upstream libarchive's main
`CMakeLists.txt` file that was removed by previous commits and
exclude it with `IF(0)` blocks. Do this as an evil merge so
that `git blame -C` can follow the content to upstream.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_write_format.3')
-rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_write_format.3 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_format.3 b/Utilities/cmlibarchive/libarchive/archive_write_format.3 index aaafb0a861..47a7403396 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_format.3 +++ b/Utilities/cmlibarchive/libarchive/archive_write_format.3 @@ -52,7 +52,7 @@ .Nm archive_write_set_format_v7tar , .Nm archive_write_set_format_warc , .Nm archive_write_set_format_xar , -.Nm archive_write_set_format_zip , +.Nm archive_write_set_format_zip .Nd functions for creating archives .Sh LIBRARY Streaming Archive Library (libarchive, -larchive) @@ -166,9 +166,9 @@ functions. .\" .Sh SEE ALSO .Xr tar 1 , -.Xr libarchive 3 , .Xr archive_write 3 , .Xr archive_write_set_options 3 , +.Xr libarchive 3 , .Xr cpio 5 , .Xr libarchive-formats 5 , .Xr mtree 5 , |