]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
projects / thirdparty / zstd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44e45e8 e4182bb)
Merge branch 'dev' into advancedAPI2
authorYann Collet <cyan@fb.com>
Tue, 30 May 2017 23:18:57 +0000 (16:18 -0700)
committerYann Collet <cyan@fb.com>
Tue, 30 May 2017 23:18:57 +0000 (16:18 -0700)
Fixed conflic in zstd_decompress.c

1  2 
lib/compress/zstd_compress.c patch | diff1 | diff2 | blob | history

diff --cc lib/compress/zstd_compress.c
Simple merge
Mirror of https://github.com/facebook/zstd.git