]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'dev' into adding_read_files_from_file_feature
authorAhmedAbdellah19 <AhmedAbdellah@fb.com>
Wed, 23 Oct 2019 18:29:01 +0000 (20:29 +0200)
committerGitHub <noreply@github.com>
Wed, 23 Oct 2019 18:29:01 +0000 (20:29 +0200)
1  2 
programs/util.c
programs/util.h
programs/zstdcli.c

diff --cc programs/util.c
Simple merge
diff --cc programs/util.h
Simple merge
Simple merge