Merge branch 'dev' into btultra2

author Yann Collet <cyan@fb.com>

Thu, 13 Dec 2018 04:18:27 +0000 (20:18 -0800)

committer Yann Collet <cyan@fb.com>

Thu, 13 Dec 2018 04:18:27 +0000 (20:18 -0800)
author Yann Collet <cyan@fb.com>
Thu, 13 Dec 2018 04:18:27 +0000 (20:18 -0800)
committer Yann Collet <cyan@fb.com>
Thu, 13 Dec 2018 04:18:27 +0000 (20:18 -0800)
diff --cc Makefile
Simple merge
diff --cc doc/zstd_manual.html
Simple merge
diff --cc lib/compress/zstd_compress.c
Simple merge
diff --cc lib/zstd.h
Simple merge
author	Yann Collet <cyan@fb.com>
	Thu, 13 Dec 2018 04:18:27 +0000 (20:18 -0800)
committer	Yann Collet <cyan@fb.com>
	Thu, 13 Dec 2018 04:18:27 +0000 (20:18 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
doc/zstd_manual.html	patch \|	diff1 \|	diff2 \|	blob \| history
lib/compress/zstd_compress.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zstd.h	patch \|	diff1 \|	diff2 \|	blob \| history