]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'dev' into newFormats
authorYann Collet <cyan@fb.com>
Sun, 24 Sep 2017 21:33:37 +0000 (14:33 -0700)
committerYann Collet <cyan@fb.com>
Sun, 24 Sep 2017 21:33:37 +0000 (14:33 -0700)
1  2 
lib/zstd.h

diff --cc lib/zstd.h
Simple merge