]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge remote-tracking branch 'refs/remotes/origin/dev' into repcodes
authorinikep <inikep@gmail.com>
Mon, 4 Apr 2016 14:28:40 +0000 (16:28 +0200)
committerinikep <inikep@gmail.com>
Mon, 4 Apr 2016 14:28:40 +0000 (16:28 +0200)
commit78e52044de6c7433754a9c018ba91d2c52250de5
tree7229996687adf69edc38e7647763d14a873e3787
parent5192b3ee658689e8e35678c759755af859b2d658
parentcb70c8ab90f3cd439ff37dcd4675eee892b2198c
Merge remote-tracking branch 'refs/remotes/origin/dev' into repcodes

# Conflicts:
# lib/zstd_compress.c
# lib/zstd_decompress.c
# lib/zstd_internal.h
# lib/zstd_opt.h
# programs/bench.c
lib/zstd_compress.c
lib/zstd_decompress.c
lib/zstd_internal.h
lib/zstd_opt.h
programs/bench.c