]> git.ipfire.org Git - thirdparty/zstd.git/commit
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)
commita49c1f1782aceb3e7a2d3893e58763b6e6d8064f
tree31e391cbc059da97b5a49ad4dcd54c291eea665f
parenta5ad5279a5fb7219c9d38d47e037054271a92d37
parentab7b6f1ececa9ce0d82d34b13a48c5c03e62e5dd
Merge branch 'dev070' of github.com:Cyan4973/zstd into dev070

Conflicts:
lib/decompress/zstd_decompress.c