Merge pull request #1109 from kientzle/Issue1055

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

Sat, 18 May 2019 21:07:38 +0000 (23:07 +0200)

committer GitHub <noreply@github.com>

Sat, 18 May 2019 21:07:38 +0000 (23:07 +0200)
author Martin Matuška <martin@matuska.org>
Sat, 18 May 2019 21:07:38 +0000 (23:07 +0200)
committer GitHub <noreply@github.com>
Sat, 18 May 2019 21:07:38 +0000 (23:07 +0200)
diff --cc Makefile.am
Simple merge
diff --cc libarchive/archive_read_support_format_zip.c
Simple merge
diff --cc libarchive/test/CMakeLists.txt
Simple merge
author	Martin Matuška <martin@matuska.org>
	Sat, 18 May 2019 21:07:38 +0000 (23:07 +0200)
committer	GitHub <noreply@github.com>
	Sat, 18 May 2019 21:07:38 +0000 (23:07 +0200)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
libarchive/archive_read_support_format_zip.c	patch \|	diff1 \|	diff2 \|	blob \| history
libarchive/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history