]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge remote-tracking branch 'refs/remotes/facebook/dev' into dev11
authorPrzemyslaw Skibinski <inikep@gmail.com>
Thu, 8 Dec 2016 09:42:42 +0000 (10:42 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Thu, 8 Dec 2016 09:42:42 +0000 (10:42 +0100)
1  2 
lib/zstd.h

diff --cc lib/zstd.h
Simple merge