]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge branch 'dev' into progressiveMT 991/head
authorYann Collet <cyan@fb.com>
Wed, 17 Jan 2018 21:51:03 +0000 (13:51 -0800)
committerYann Collet <cyan@fb.com>
Wed, 17 Jan 2018 21:51:03 +0000 (13:51 -0800)
commitb86865323a1bdce609465f9a251cf649fda26d6a
tree5647c3405a09ebc7446fae118b590f1a8a575483
parentd14cc881b0f039d641cd3a7df33bad897320e654
parentfbb703ea5e3a1b838815fff74a06d219d63ccf7d
Merge branch 'dev' into progressiveMT

fixed minor conflict on cdict
lib/compress/zstd_compress.c