Merge pull request #1188 from GeorgeLu97/BenchModule

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

Mon, 2 Jul 2018 20:33:27 +0000 (13:33 -0700)

committer GitHub <noreply@github.com>

Mon, 2 Jul 2018 20:33:27 +0000 (13:33 -0700)
author Yann Collet <Cyan4973@users.noreply.github.com>
Mon, 2 Jul 2018 20:33:27 +0000 (13:33 -0700)
committer GitHub <noreply@github.com>
Mon, 2 Jul 2018 20:33:27 +0000 (13:33 -0700)
diff --cc build/VS2010/fullbench/fullbench.vcxproj
Simple merge
diff --cc programs/zstdcli.c
Simple merge
diff --cc tests/Makefile
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Mon, 2 Jul 2018 20:33:27 +0000 (13:33 -0700)
committer	GitHub <noreply@github.com>
	Mon, 2 Jul 2018 20:33:27 +0000 (13:33 -0700)
		1	2
build/VS2010/fullbench/fullbench.vcxproj	patch \|	diff1 \|	diff2 \|	blob \| history
programs/zstdcli.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history