Merge pull request #1815 from facebook/zlibwrap

author Yann Collet <Cyan4973@users.noreply.github.com>

Wed, 16 Oct 2019 23:45:15 +0000 (16:45 -0700)

committer GitHub <noreply@github.com>

Wed, 16 Oct 2019 23:45:15 +0000 (16:45 -0700)
author Yann Collet <Cyan4973@users.noreply.github.com>
Wed, 16 Oct 2019 23:45:15 +0000 (16:45 -0700)
committer GitHub <noreply@github.com>
Wed, 16 Oct 2019 23:45:15 +0000 (16:45 -0700)
diff --cc lib/common/zstd_internal.h
Simple merge
diff --cc lib/zstd.h
Simple merge
diff --cc programs/util.c
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Wed, 16 Oct 2019 23:45:15 +0000 (16:45 -0700)
committer	GitHub <noreply@github.com>
	Wed, 16 Oct 2019 23:45:15 +0000 (16:45 -0700)
		1	2
lib/common/zstd_internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zstd.h	patch \|	diff1 \|	diff2 \|	blob \| history
programs/util.c	patch \|	diff1 \|	diff2 \|	blob \| history