Merge pull request #1518 from ghost/zip-zstd

author Martin Matuška <martin@matuska.org>

Sat, 5 Feb 2022 09:32:21 +0000 (10:32 +0100)

committer GitHub <noreply@github.com>

Sat, 5 Feb 2022 09:32:21 +0000 (10:32 +0100)
author Martin Matuška <martin@matuska.org>
Sat, 5 Feb 2022 09:32:21 +0000 (10:32 +0100)
committer GitHub <noreply@github.com>
Sat, 5 Feb 2022 09:32:21 +0000 (10:32 +0100)
diff --cc libarchive/archive_read_support_format_zip.c
Simple merge
diff --cc libarchive/test/test_read_format_zip.c
Simple merge
author	Martin Matuška <martin@matuska.org>
	Sat, 5 Feb 2022 09:32:21 +0000 (10:32 +0100)
committer	GitHub <noreply@github.com>
	Sat, 5 Feb 2022 09:32:21 +0000 (10:32 +0100)
		1	2
libarchive/archive_read_support_format_zip.c	patch \|	diff1 \|	diff2 \|	blob \| history
libarchive/test/test_read_format_zip.c	patch \|	diff1 \|	diff2 \|	blob \| history