Merge pull request #905 from iburinoc/zstd

author Tim Kientzle <kientzle@acm.org>

Sun, 13 Aug 2017 06:05:31 +0000 (23:05 -0700)

committer GitHub <noreply@github.com>

Sun, 13 Aug 2017 06:05:31 +0000 (23:05 -0700)
author Tim Kientzle <kientzle@acm.org>
Sun, 13 Aug 2017 06:05:31 +0000 (23:05 -0700)
committer GitHub <noreply@github.com>
Sun, 13 Aug 2017 06:05:31 +0000 (23:05 -0700)
diff --cc CMakeLists.txt
Simple merge
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
diff --cc libarchive/archive.h
Simple merge
author	Tim Kientzle <kientzle@acm.org>
	Sun, 13 Aug 2017 06:05:31 +0000 (23:05 -0700)
committer	GitHub <noreply@github.com>
	Sun, 13 Aug 2017 06:05:31 +0000 (23:05 -0700)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
libarchive/archive.h	patch \|	diff1 \|	diff2 \|	blob \| history