]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge remote-tracking branch 'refs/remotes/Cyan4973/v05x' into v05x
authorinikep <inikep@gmail.com>
Wed, 3 Feb 2016 16:29:40 +0000 (17:29 +0100)
committerinikep <inikep@gmail.com>
Wed, 3 Feb 2016 16:29:40 +0000 (17:29 +0100)
commit53721f134c2026248bb0cd01da155ef55032efa5
tree096ba4213db17f6f605dae1097b6865fa6206c82
parent78e5ea3a32c39c9334ae623e60dd5e498d5d7cf4
parentb010b3b6271c629d36aa5f2d83abb954ff6cab2c
Merge remote-tracking branch 'refs/remotes/Cyan4973/v05x' into v05x

# Conflicts:
# lib/zstd_compress.c
# lib/zstd_static.h
lib/zstd_compress.c
lib/zstd_decompress.c
lib/zstd_static.h