Merge pull request #1168 from GeorgeLu97/paramgrillfeatures

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

Wed, 13 Jun 2018 15:38:29 +0000 (11:38 -0400)

committer GitHub <noreply@github.com>

Wed, 13 Jun 2018 15:38:29 +0000 (11:38 -0400)
author Yann Collet <Cyan4973@users.noreply.github.com>
Wed, 13 Jun 2018 15:38:29 +0000 (11:38 -0400)
committer GitHub <noreply@github.com>
Wed, 13 Jun 2018 15:38:29 +0000 (11:38 -0400)
diff --cc tests/Makefile
Simple merge
diff --cc tests/paramgrill.c
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Wed, 13 Jun 2018 15:38:29 +0000 (11:38 -0400)
committer	GitHub <noreply@github.com>
	Wed, 13 Jun 2018 15:38:29 +0000 (11:38 -0400)
		1	2
tests/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tests/paramgrill.c	patch \|	diff1 \|	diff2 \|	blob \| history