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: ea1f50b e45a2ae)

author	Yann Collet <cyan@fb.com>
	Wed, 27 Sep 2017 23:39:40 +0000 (16:39 -0700)
committer	Yann Collet <cyan@fb.com>
	Wed, 27 Sep 2017 23:39:40 +0000 (16:39 -0700)
commit	54a827fff04743af7608de40403a129c43e8ebaf
tree	fe520df7890ff9125c07baced83a91fd10b6b654	tree
parent	ea1f50bf73a1f49bacfd4603e1e86d5bc0b9f31f	commit \| diff
parent	e45a2aea9bef93cc6b12b2a0c5a4721f1e0aa715	commit \| diff

Merge branch 'dev' into newFormats

Fixed conflicts in zstdmt_compress.c

lib/common/zstd_internal.h	diff1 \|	diff2 \|	blob \| history
lib/compress/zstd_compress.c	diff1 \|	diff2 \|	blob \| history
lib/compress/zstdmt_compress.c	diff1 \|	diff2 \|	blob \| history
lib/decompress/zstd_decompress.c	diff1 \|	diff2 \|	blob \| history
lib/zstd.h	diff1 \|	diff2 \|	blob \| history
programs/fileio.c	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