svn commit: r320932 - head/contrib/libarchive/libarchive

Martin Matuska mm at FreeBSD.org
Thu Jul 13 04:46:01 UTC 2017


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 at 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


More information about the svn-src-head mailing list