From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 16 May 2015 20:36:13 +0000 (-0700)
Subject: Merge pull request #536 from pombredanne/patch-1
X-Git-Tag: v3.1.900a~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daf7e7de377943c9f11c7ea51bf671cf37043c39;p=thirdparty%2Flibarchive.git

Merge pull request #536 from pombredanne/patch-1

Fixing path to UC Regents-copyrighted file.
---

daf7e7de377943c9f11c7ea51bf671cf37043c39
diff --cc COPYING
index 67c2fb76c,2e2e81af8..93952b77a
--- a/COPYING
+++ b/COPYING
@@@ -17,11 -17,12 +17,11 @@@ the actual statements in the files are 
    files for details:
     libarchive/archive_entry.c
     libarchive/archive_read_support_filter_compress.c
-    libarchive/archive_write_set_filter_compress.c
+    libarchive/archive_write_add_filter_compress.c
     libarchive/mtree.5
 -   tar/matching.c
  
  * The following source files are in the public domain:
 -   tar/getdate.c
 +   libarchive/archive_getdate.c
  
  * The build files---including Makefiles, configure scripts,
    and auxiliary scripts used as part of the compile process---have