]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev070' into dev070
authorinikep <inikep@gmail.com>
Wed, 1 Jun 2016 07:16:11 +0000 (09:16 +0200)
committerinikep <inikep@gmail.com>
Wed, 1 Jun 2016 07:16:11 +0000 (09:16 +0200)
commit5c2771710d69a775e879e971e7f1ff2bd13f45b6
tree39e443b35205bcbf578e0c37149bd4266769fc47
parent00fa1ae0c02df0a9527f8b6e3b9dfc90c39b0f70
parent202844ebd01b157350ead2bfadcf302a3b1b27f7
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev070' into dev070

# Conflicts:
# .gitignore
# lib/decompress/zstd_decompress.c
# programs/zbufftest.c
.gitignore
lib/common/zstd_static.h
lib/decompress/zstd_decompress.c
programs/zbufftest.c