Merge pull request #536 from iburinoc/multiframe

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

Mon, 13 Feb 2017 20:18:16 +0000 (12:18 -0800)

committer GitHub <noreply@github.com>

Mon, 13 Feb 2017 20:18:16 +0000 (12:18 -0800)
author Yann Collet <Cyan4973@users.noreply.github.com>
Mon, 13 Feb 2017 20:18:16 +0000 (12:18 -0800)
committer GitHub <noreply@github.com>
Mon, 13 Feb 2017 20:18:16 +0000 (12:18 -0800)
diff --cc programs/fileio.c
Simple merge
diff --cc programs/util.h
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Mon, 13 Feb 2017 20:18:16 +0000 (12:18 -0800)
committer	GitHub <noreply@github.com>
	Mon, 13 Feb 2017 20:18:16 +0000 (12:18 -0800)
		1	2
programs/fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history
programs/util.h	patch \|	diff1 \|	diff2 \|	blob \| history