]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev060' into dev 164/head
authorinikep <inikep@gmail.com>
Thu, 7 Apr 2016 17:50:03 +0000 (19:50 +0200)
committerinikep <inikep@gmail.com>
Thu, 7 Apr 2016 17:50:03 +0000 (19:50 +0200)
commitafe1f7994be61252e5d17cdb7c36a441bde537b4
tree871d0b576d5f48a7ce87e96cec17790b167595c5
parent2bf79f9bff71c55898db71d5997ccbcb92650acf
parentd7bee33caf22703dad5233fbcff5d52c03d984a5
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev060' into dev

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