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/tar.5 | |
| 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/tar.5')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/tar.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/tar.5 b/Utilities/cmlibarchive/libarchive/tar.5 index 688bb92..6e6f0c0 100644 --- a/Utilities/cmlibarchive/libarchive/tar.5 +++ b/Utilities/cmlibarchive/libarchive/tar.5 @@ -935,7 +935,7 @@ and formed the basis of (circa 1988). Joerg Shilling's .Nm star -archiver is another open-source (GPL) archiver (originally developed +archiver is another open-source (CDDL) archiver (originally developed circa 1985) which features complete support for pax interchange format. .Pp |