Merge pull request #2597 from terrelln/public-headers

author Nick Terrell <terrelln@fb.com>

Tue, 4 May 2021 18:28:41 +0000 (11:28 -0700)

committer GitHub <noreply@github.com>

Tue, 4 May 2021 18:28:41 +0000 (11:28 -0700)
author Nick Terrell <terrelln@fb.com>
Tue, 4 May 2021 18:28:41 +0000 (11:28 -0700)
committer GitHub <noreply@github.com>
Tue, 4 May 2021 18:28:41 +0000 (11:28 -0700)
diff --cc lib/Makefile
Simple merge
diff --cc lib/zstd.h
Simple merge
author	Nick Terrell <terrelln@fb.com>
	Tue, 4 May 2021 18:28:41 +0000 (11:28 -0700)
committer	GitHub <noreply@github.com>
	Tue, 4 May 2021 18:28:41 +0000 (11:28 -0700)
		1	2
lib/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zstd.h	patch \|	diff1 \|	diff2 \|	blob \| history