Date: Thu, 13 Jul 2017 04:46:00 +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: r320932 - head/contrib/libarchive/libarchive Message-ID: <201707130446.v6D4k0vF069539@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Thu Jul 13 04:46:00 2017 New Revision: 320932 URL: https://svnweb.freebsd.org/changeset/base/320932 Log: Fix libarchive mismerge of r320927 in libarchive_entry.h MFC after: 1 week X-MFC-with: 320927 Reported by: Ngie Cooper <ngie@FreeBSD.org> Modified: head/contrib/libarchive/libarchive/archive_entry.h Modified: head/contrib/libarchive/libarchive/archive_entry.h ============================================================================== --- head/contrib/libarchive/libarchive/archive_entry.h Thu Jul 13 04:42:29 2017 (r320931) +++ head/contrib/libarchive/libarchive/archive_entry.h Thu Jul 13 04:46:00 2017 (r320932) @@ -30,7 +30,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3003001 +#define ARCHIVE_VERSION_NUMBER 3003002 /* * Note: archive_entry.h is for use outside of libarchive; the
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707130446.v6D4k0vF069539>