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: d700a1a 5a854af)

author	inikep <inikep@gmail.com>
	Tue, 22 Mar 2016 13:38:34 +0000 (14:38 +0100)
committer	inikep <inikep@gmail.com>
	Tue, 22 Mar 2016 13:38:34 +0000 (14:38 +0100)
commit	2872b6f01f86f7f056245ff3a55799017d767f69
tree	b8082364c387fbfa37fe4b5c23c9785412d9fa68	tree \| snapshot
parent	d700a1a8b911aaf64cd65d714a8eda980f54765d	commit \| diff
parent	5a854af006bf2ab28133c4cf3ec3d30c53feb73a	commit \| diff

Merge remote-tracking branch 'refs/remotes/Cyan4973/dev060' into dev

# Conflicts:
# lib/zstd_compress.c
# programs/bench.c

lib/zstd_compress.c	diff1 \|	diff2 \|	blob \| history
lib/zstd_internal.h	diff1 \|	diff2 \|	blob \| history
programs/.gitignore	diff1 \|	diff2 \|	blob \| history
programs/bench.c	diff1 \|	diff2 \|	blob \| history
programs/bench.h	diff1 \|	diff2 \|	blob \| history
programs/fullbench.c	diff1 \|	diff2 \|	blob \| history
programs/zstdcli.c	diff1 \|	diff2 \|	blob \| history

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