]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'dev' into fullbench
authorcyan4973 <yann.collet.73@gmail.com>
Sat, 1 Jul 2017 14:01:08 +0000 (07:01 -0700)
committercyan4973 <yann.collet.73@gmail.com>
Sat, 1 Jul 2017 14:01:08 +0000 (07:01 -0700)

Trivial merge