diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-21 14:12:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-21 14:18:52 (GMT) |
| commit | 932848f420a738ee07997198fead5b2c2fbf4787 (patch) | |
| tree | 40404c3244ba87c5e71e8dd076f4dbcde6d8cfeb /Utilities/cmlibarchive/libarchive/archive_entry_perms.3 | |
| parent | e4b7d5afde91efafb59749a0a513732a089a6f0a (diff) | |
| parent | 1a8c7bc2c649781d1163c1966245a45e0fb829ba (diff) | |
| download | CMake-932848f420a738ee07997198fead5b2c2fbf4787.zip CMake-932848f420a738ee07997198fead5b2c2fbf4787.tar.gz CMake-932848f420a738ee07997198fead5b2c2fbf4787.tar.bz2 | |
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts by integrating changes from both sides.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_entry_perms.3')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_entry_perms.3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry_perms.3 b/Utilities/cmlibarchive/libarchive/archive_entry_perms.3 index 5b7b5d9..340c5ea 100644 --- a/Utilities/cmlibarchive/libarchive/archive_entry_perms.3 +++ b/Utilities/cmlibarchive/libarchive/archive_entry_perms.3 @@ -194,11 +194,11 @@ every name that is recognized. .Xr strtofflags 3 , which stops parsing at the first unrecognized name.) .Sh SEE ALSO -.Xr archive 3 , .Xr archive_entry 3 , .Xr archive_entry_acl 3 , .Xr archive_read_disk 3 , .Xr archive_write_disk 3 +.Xr libarchive 3 , .Sh BUGS The platform types .Vt uid_t |