]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'dev' into constCDict 994/head
authorYann Collet <cyan@fb.com>
Thu, 18 Jan 2018 21:36:43 +0000 (13:36 -0800)
committerYann Collet <cyan@fb.com>
Thu, 18 Jan 2018 21:36:43 +0000 (13:36 -0800)
1  2 
lib/compress/zstd_compress.c
lib/decompress/zstd_decompress.c
lib/zstd.h

Simple merge
Simple merge
diff --cc lib/zstd.h
Simple merge