]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev060' into dev 139/head
authorinikep <inikep@gmail.com>
Fri, 4 Mar 2016 19:10:09 +0000 (20:10 +0100)
committerinikep <inikep@gmail.com>
Fri, 4 Mar 2016 19:10:09 +0000 (20:10 +0100)
commit01060bc477e5a5821011eaa1361b1344fa8c877a
tree2966454786df7944fe9a10419e76991fc4fde06a
parentf3c6503e5517a855f065428eca44971c1a0dd482
parent944d0d22852696d25e0b749961ab25236a92d45f
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev060' into dev

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