Merge branch 'dev' into decTest

author Yann Collet <cyan@fb.com>

Thu, 29 Aug 2019 16:48:12 +0000 (09:48 -0700)

committer Yann Collet <cyan@fb.com>

Thu, 29 Aug 2019 16:48:12 +0000 (09:48 -0700)
author Yann Collet <cyan@fb.com>
Thu, 29 Aug 2019 16:48:12 +0000 (09:48 -0700)
committer Yann Collet <cyan@fb.com>
Thu, 29 Aug 2019 16:48:12 +0000 (09:48 -0700)
diff --cc contrib/single_file_decoder/examples/simple.c
Simple merge
diff --cc contrib/single_file_decoder/zstddeclib-in.c
Simple merge
author	Yann Collet <cyan@fb.com>
	Thu, 29 Aug 2019 16:48:12 +0000 (09:48 -0700)
committer	Yann Collet <cyan@fb.com>
	Thu, 29 Aug 2019 16:48:12 +0000 (09:48 -0700)
		1	2
contrib/single_file_decoder/examples/simple.c	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/single_file_decoder/zstddeclib-in.c	patch \|	diff1 \|	diff2 \|	blob \| history