Merge branch 'dev' into seekTable

author Yann Collet <cyan@fb.com>

Wed, 3 Mar 2021 23:08:40 +0000 (15:08 -0800)

committer Yann Collet <cyan@fb.com>

Wed, 3 Mar 2021 23:08:40 +0000 (15:08 -0800)
author Yann Collet <cyan@fb.com>
Wed, 3 Mar 2021 23:08:40 +0000 (15:08 -0800)
committer Yann Collet <cyan@fb.com>
Wed, 3 Mar 2021 23:08:40 +0000 (15:08 -0800)
diff --cc contrib/seekable_format/tests/seekable_tests.c
Simple merge
diff --cc contrib/seekable_format/zstdseek_decompress.c
Simple merge
author	Yann Collet <cyan@fb.com>
	Wed, 3 Mar 2021 23:08:40 +0000 (15:08 -0800)
committer	Yann Collet <cyan@fb.com>
	Wed, 3 Mar 2021 23:08:40 +0000 (15:08 -0800)
		1	2
contrib/seekable_format/tests/seekable_tests.c	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/seekable_format/zstdseek_decompress.c	patch \|	diff1 \|	diff2 \|	blob \| history