Date: Thu, 13 Jul 2017 04:42:29 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320931 - head/contrib/libarchive/libarchive Message-ID: <201707130442.v6D4gTw2069332@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Thu Jul 13 04:42:29 2017 New Revision: 320931 URL: https://svnweb.freebsd.org/changeset/base/320931 Log: Fix libarchive mismerge of r320927 MFC after: 1 week X-MFC-with: 320927 Reported by: Ngie Cooper <ngie@FreeBSD.org> Modified: head/contrib/libarchive/libarchive/archive.h Modified: head/contrib/libarchive/libarchive/archive.h ============================================================================== --- head/contrib/libarchive/libarchive/archive.h Thu Jul 13 03:52:54 2017 (r320930) +++ head/contrib/libarchive/libarchive/archive.h Thu Jul 13 04:42:29 2017 (r320931) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707130442.v6D4gTw2069332>