Merge pull request #1000 from facebook/progressiveFlush

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

Wed, 31 Jan 2018 06:49:47 +0000 (22:49 -0800)

committer GitHub <noreply@github.com>

Wed, 31 Jan 2018 06:49:47 +0000 (22:49 -0800)
author Yann Collet <Cyan4973@users.noreply.github.com>
Wed, 31 Jan 2018 06:49:47 +0000 (22:49 -0800)
committer GitHub <noreply@github.com>
Wed, 31 Jan 2018 06:49:47 +0000 (22:49 -0800)
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 <Cyan4973@users.noreply.github.com>
	Wed, 31 Jan 2018 06:49:47 +0000 (22:49 -0800)
committer	GitHub <noreply@github.com>
	Wed, 31 Jan 2018 06:49:47 +0000 (22:49 -0800)
		1	2
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