]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge pull request #136 from inikep/dev
authorYann Collet <yann.collet.73@gmail.com>
Tue, 1 Mar 2016 16:31:03 +0000 (17:31 +0100)
committerYann Collet <yann.collet.73@gmail.com>
Tue, 1 Mar 2016 16:31:03 +0000 (17:31 +0100)
merging mml3 mode

1  2 
lib/zstd_static.h

Simple merge