]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
projects / thirdparty / zstd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5ad527 ab7b6f1)
Merge branch 'dev070' of github.com:Cyan4973/zstd into dev070
authorYann Collet <yann.collet.73@gmail.com>
Fri, 3 Jun 2016 21:08:04 +0000 (23:08 +0200)
committerYann Collet <yann.collet.73@gmail.com>
Fri, 3 Jun 2016 21:08:04 +0000 (23:08 +0200)
Conflicts:
lib/decompress/zstd_decompress.c


Trivial merge
Mirror of https://github.com/facebook/zstd.git