]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge branch 'dev' into dubtlazy 970/head
authorYann Collet <cyan@fb.com>
Thu, 11 Jan 2018 21:25:08 +0000 (13:25 -0800)
committerYann Collet <cyan@fb.com>
Thu, 11 Jan 2018 21:25:08 +0000 (13:25 -0800)
commitcacf47cbee5fa05a45fc6697deb325f99c74ea17
tree61eed2874238b2342d7ae95b15fe2f4399be0692
parentb9a14900ff95965868c5c21276cf59d509cd35a1
parent04c00f9388b5d57665792571fe46a7eadc973c8d
Merge branch 'dev' into dubtlazy

and fixed conflicts
lib/compress/zstd_compress.c
tests/fuzzer.c