git.ipfire.org Git - thirdparty/zstd.git/commit

]> git.ipfire.org Git - thirdparty/zstd.git/commit

projects / thirdparty / zstd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bbef058 824f75e)

author	Yann Collet <cyan@fb.com>
	Thu, 28 Sep 2017 19:19:28 +0000 (12:19 -0700)
committer	Yann Collet <cyan@fb.com>
	Thu, 28 Sep 2017 19:19:28 +0000 (12:19 -0700)
commit	e4ec42772066fb0c30b2d43ab6e75108815bb86a
tree	8d92ebbb7ec0dc20c382ce9707b0d608471efd51	tree \| snapshot
parent	bbef058ae6f2e931c9af59b6da4f1f666775fb23	commit \| diff
parent	824f75ea7c48a2db26693699a2178ecea84dfb7a	commit \| diff

Merge branch 'dev' into shorterTests

fixed conflicts

lib/compress/zstd_compress.c	diff1 \|	diff2 \|	blob \| history
lib/compress/zstdmt_compress.c	diff1 \|	diff2 \|	blob \| history
lib/zstd.h	diff1 \|	diff2 \|	blob \| history
tests/playTests.sh	diff1 \|	diff2 \|	blob \| history
tests/zstreamtest.c	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/facebook/zstd.git