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
(parent: 73f8905) | patch

author	Sen Huang <senhuang96@fb.com>
	Tue, 5 Nov 2019 20:51:25 +0000 (15:51 -0500)
committer	Sen Huang <senhuang96@fb.com>
	Tue, 5 Nov 2019 20:51:25 +0000 (15:51 -0500)
commit	7ce891870c41fa138c6056eae836638c4b87b13f
tree	6fc73014f731a3b6169d5732616ad1c4bff5b8fd	tree \| snapshot
parent	73f8905b83e3575c12a380b9f2385b7f23fe779d	commit \| diff

Fix merge conflicts

18 files changed:

build/VS2008/fullbench/fullbench.vcproj		diff \| blob \| blame \| history
build/VS2008/fuzzer/fuzzer.vcproj		diff \| blob \| blame \| history
build/VS2008/zstd/zstd.vcproj		diff \| blob \| blame \| history
build/VS2008/zstdlib/zstdlib.vcproj		diff \| blob \| blame \| history
build/VS2010/fullbench/fullbench.vcxproj		diff \| blob \| blame \| history
build/VS2010/fuzzer/fuzzer.vcxproj		diff \| blob \| blame \| history
build/VS2010/libzstd-dll/libzstd-dll.vcxproj		diff \| blob \| blame \| history
build/VS2010/libzstd/libzstd.vcxproj		diff \| blob \| blame \| history
build/VS2010/zstd/zstd.vcxproj		diff \| blob \| blame \| history
build/meson/lib/meson.build		diff \| blob \| blame \| history
lib/common/huf.h		diff \| blob \| blame \| history
lib/compress/huf_compress.c		diff \| blob \| blame \| history
lib/compress/zstd_compress.c		diff \| blob \| blame \| history
lib/compress/zstd_compress_internal.h		diff \| blob \| blame \| history
lib/compress/zstd_compress_sequences.c		diff \| blob \| blame \| history
lib/compress/zstd_compress_sequences.h		diff \| blob \| blame \| history
lib/compress/zstd_compress_superblock.c	[new file with mode: 0644]	blob
lib/compress/zstd_compress_superblock.h	[new file with mode: 0644]	blob

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