]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge remote-tracking branch 'refs/remotes/facebook/dev' into zlibWrapper
authorinikep <inikep@gmail.com>
Thu, 22 Sep 2016 08:28:13 +0000 (10:28 +0200)
committerinikep <inikep@gmail.com>
Thu, 22 Sep 2016 08:28:13 +0000 (10:28 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge