]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'dev' into advancedAPI2
authorYann Collet <cyan@fb.com>
Mon, 22 May 2017 19:33:56 +0000 (12:33 -0700)
committerYann Collet <cyan@fb.com>
Mon, 22 May 2017 19:33:56 +0000 (12:33 -0700)
1  2 
lib/zstd.h

diff --cc lib/zstd.h
Simple merge