Merge branch 'dev' into ahmed_file

author Yann Collet <cyan@fb.com>

Tue, 5 Nov 2019 22:44:12 +0000 (14:44 -0800)

committer Yann Collet <cyan@fb.com>

Tue, 5 Nov 2019 22:44:12 +0000 (14:44 -0800)
author Yann Collet <cyan@fb.com>
Tue, 5 Nov 2019 22:44:12 +0000 (14:44 -0800)
committer Yann Collet <cyan@fb.com>
Tue, 5 Nov 2019 22:44:12 +0000 (14:44 -0800)
diff --cc programs/util.c
Simple merge
diff --cc programs/util.h
Simple merge
diff --cc programs/zstdcli.c
Simple merge
diff --cc tests/playTests.sh
Simple merge
author	Yann Collet <cyan@fb.com>
	Tue, 5 Nov 2019 22:44:12 +0000 (14:44 -0800)
committer	Yann Collet <cyan@fb.com>
	Tue, 5 Nov 2019 22:44:12 +0000 (14:44 -0800)
		1	2
programs/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
programs/util.h	patch \|	diff1 \|	diff2 \|	blob \| history
programs/zstdcli.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/playTests.sh	patch \|	diff1 \|	diff2 \|	blob \| history