diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2017-07-13 04:42:29 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2017-07-13 04:42:29 +0000 |
| commit | b86cbbb3add8c0dc67ceb32fa877e9dadad2b7bb (patch) | |
| tree | 5cf9fb1ae9fc9e4b2a8659eca79ef957422863ea /contrib/libarchive | |
| parent | b5ddde39acbf9f991ae5be15507dbfb6a4472b15 (diff) | |
| download | src-test2-b86cbbb3add8c0dc67ceb32fa877e9dadad2b7bb.tar.gz src-test2-b86cbbb3add8c0dc67ceb32fa877e9dadad2b7bb.zip | |
Fix libarchive mismerge of r320927
MFC after: 1 week
X-MFC-with: 320927
Reported by: Ngie Cooper <ngie@FreeBSD.org>
Notes
Notes:
svn path=/head/; revision=320931
Diffstat (limited to 'contrib/libarchive')
| -rw-r--r-- | contrib/libarchive/libarchive/archive.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libarchive/libarchive/archive.h b/contrib/libarchive/libarchive/archive.h index 19f1754be770..c3681e60c50a 100644 --- a/contrib/libarchive/libarchive/archive.h +++ b/contrib/libarchive/libarchive/archive.h @@ -36,7 +36,7 @@ * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3003001 +#define ARCHIVE_VERSION_NUMBER 3003002 #include <sys/stat.h> #include <stddef.h> /* for wchar_t */ |