Merge branch 'advancedAPI2' into refPrefix

author Yann Collet <cyan@fb.com>

Wed, 28 Jun 2017 23:35:49 +0000 (16:35 -0700)

committer Yann Collet <cyan@fb.com>

Wed, 28 Jun 2017 23:35:49 +0000 (16:35 -0700)
author Yann Collet <cyan@fb.com>
Wed, 28 Jun 2017 23:35:49 +0000 (16:35 -0700)
committer Yann Collet <cyan@fb.com>
Wed, 28 Jun 2017 23:35:49 +0000 (16:35 -0700)
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>
	Wed, 28 Jun 2017 23:35:49 +0000 (16:35 -0700)
committer	Yann Collet <cyan@fb.com>
	Wed, 28 Jun 2017 23:35:49 +0000 (16:35 -0700)
		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