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: f0ffa23 900f39e)

author	Yann Collet <cyan@fb.com>
	Sat, 21 Jan 2017 00:44:50 +0000 (16:44 -0800)
committer	Yann Collet <cyan@fb.com>
	Sat, 21 Jan 2017 00:44:50 +0000 (16:44 -0800)
commit	d7e3cb58c5eebba59b527ff54697cf950f53542c
tree	16db1a5add3794e2fed7e82f2a7fd3042a14911f	tree \| snapshot
parent	f0ffa237da8180d7aff82f41d43da12d881e62ea	commit \| diff
parent	900f39e7091f39f5d8ca50d7f9fdc25e68f4e0e9	commit \| diff

Resolved merge conflict dev+zstdmt

Makefile	diff1 \|	diff2 \|	blob \| history
build/VS2008/zstd/zstd.vcproj	diff1 \|	diff2 \|	blob \| history
build/VS2010/zstd/zstd.vcxproj	diff1 \|	diff2 \|	blob \| history
build/cmake/lib/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
lib/compress/zstd_compress.c	diff1 \|	diff2 \|	blob \| history
lib/zstd.h	diff1 \|	diff2 \|	blob \| history
programs/Makefile	diff1 \|	diff2 \|	blob \| history
programs/zstdcli.c	diff1 \|	diff2 \|	blob \| history
tests/Makefile	diff1 \|	diff2 \|	blob \| history
tests/zstreamtest.c	diff1 \|	diff2 \|	blob \| history

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