]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
projects / thirdparty / zstd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3c6503 944d0d2)
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev060' into dev 139/head
authorinikep <inikep@gmail.com>
Fri, 4 Mar 2016 19:10:09 +0000 (20:10 +0100)
committerinikep <inikep@gmail.com>
Fri, 4 Mar 2016 19:10:09 +0000 (20:10 +0100)
# Conflicts:
# lib/zstd_compress.c

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

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