Merge pull request #573 from facebook/ddict

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

Tue, 28 Feb 2017 04:54:42 +0000 (20:54 -0800)

committer GitHub <noreply@github.com>

Tue, 28 Feb 2017 04:54:42 +0000 (20:54 -0800)
author Yann Collet <Cyan4973@users.noreply.github.com>
Tue, 28 Feb 2017 04:54:42 +0000 (20:54 -0800)
committer GitHub <noreply@github.com>
Tue, 28 Feb 2017 04:54:42 +0000 (20:54 -0800)
diff --cc programs/fileio.c
Simple merge
diff --cc tests/playTests.sh
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Tue, 28 Feb 2017 04:54:42 +0000 (20:54 -0800)
committer	GitHub <noreply@github.com>
	Tue, 28 Feb 2017 04:54:42 +0000 (20:54 -0800)
		1	2
programs/fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/playTests.sh	patch \|	diff1 \|	diff2 \|	blob \| history