Merge branch 'srcSize' into dev

author Yann Collet <cyan@fb.com>

Mon, 2 Oct 2017 23:34:14 +0000 (16:34 -0700)

committer Yann Collet <cyan@fb.com>

Mon, 2 Oct 2017 23:34:14 +0000 (16:34 -0700)
author Yann Collet <cyan@fb.com>
Mon, 2 Oct 2017 23:34:14 +0000 (16:34 -0700)
committer Yann Collet <cyan@fb.com>
Mon, 2 Oct 2017 23:34:14 +0000 (16:34 -0700)
diff --cc lib/compress/zstd_compress.c
Simple merge
diff --cc lib/zstd.h
Simple merge
diff --cc programs/fileio.c
Simple merge
author	Yann Collet <cyan@fb.com>
	Mon, 2 Oct 2017 23:34:14 +0000 (16:34 -0700)
committer	Yann Collet <cyan@fb.com>
	Mon, 2 Oct 2017 23:34:14 +0000 (16:34 -0700)
		1	2
lib/compress/zstd_compress.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zstd.h	patch \|	diff1 \|	diff2 \|	blob \| history
programs/fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history