Merge pull request #753 from paulcruz74/adapt-approach-3

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

Thu, 27 Jul 2017 17:00:10 +0000 (10:00 -0700)

committer GitHub <noreply@github.com>

Thu, 27 Jul 2017 17:00:10 +0000 (10:00 -0700)
author Yann Collet <Cyan4973@users.noreply.github.com>
Thu, 27 Jul 2017 17:00:10 +0000 (10:00 -0700)
committer GitHub <noreply@github.com>
Thu, 27 Jul 2017 17:00:10 +0000 (10:00 -0700)
diff --cc lib/compress/zstd_compress.c
Simple merge
diff --cc lib/zstd.h
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Thu, 27 Jul 2017 17:00:10 +0000 (10:00 -0700)
committer	GitHub <noreply@github.com>
	Thu, 27 Jul 2017 17:00:10 +0000 (10:00 -0700)
		1	2
lib/compress/zstd_compress.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zstd.h	patch \|	diff1 \|	diff2 \|	blob \| history