Merge branch 'dev' into adding_read_files_from_file_feature

author AhmedAbdellah19 <AhmedAbdellah@fb.com>

Wed, 23 Oct 2019 18:29:01 +0000 (20:29 +0200)

committer GitHub <noreply@github.com>

Wed, 23 Oct 2019 18:29:01 +0000 (20:29 +0200)
author AhmedAbdellah19 <AhmedAbdellah@fb.com>
Wed, 23 Oct 2019 18:29:01 +0000 (20:29 +0200)
committer GitHub <noreply@github.com>
Wed, 23 Oct 2019 18:29:01 +0000 (20:29 +0200)
diff --cc programs/util.c
Simple merge
diff --cc programs/util.h
Simple merge
diff --cc programs/zstdcli.c
Simple merge
author	AhmedAbdellah19 <AhmedAbdellah@fb.com>
	Wed, 23 Oct 2019 18:29:01 +0000 (20:29 +0200)
committer	GitHub <noreply@github.com>
	Wed, 23 Oct 2019 18:29:01 +0000 (20:29 +0200)
		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