Merge pull request #1812 from senhuang42/output-dir-flat

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

Mon, 14 Oct 2019 16:25:05 +0000 (09:25 -0700)

committer GitHub <noreply@github.com>

Mon, 14 Oct 2019 16:25:05 +0000 (09:25 -0700)
author Yann Collet <Cyan4973@users.noreply.github.com>
Mon, 14 Oct 2019 16:25:05 +0000 (09:25 -0700)
committer GitHub <noreply@github.com>
Mon, 14 Oct 2019 16:25:05 +0000 (09:25 -0700)
diff --cc programs/fileio.c
Simple merge
diff --cc programs/util.c
Simple merge
diff --cc programs/util.h
Simple merge
diff --cc tests/playTests.sh
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Mon, 14 Oct 2019 16:25:05 +0000 (09:25 -0700)
committer	GitHub <noreply@github.com>
	Mon, 14 Oct 2019 16:25:05 +0000 (09:25 -0700)
		1	2
programs/fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history
programs/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
programs/util.h	patch \|	diff1 \|	diff2 \|	blob \| history
tests/playTests.sh	patch \|	diff1 \|	diff2 \|	blob \| history