]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge branch 'dev' into advancedAPI2
authorYann Collet <cyan@fb.com>
Tue, 30 May 2017 23:18:57 +0000 (16:18 -0700)
committerYann Collet <cyan@fb.com>
Tue, 30 May 2017 23:18:57 +0000 (16:18 -0700)
commitbeb62b15a8e10dd729f56fb6ad011f38c8f63da0
treea68f61988198d75ad957b6fbc9673cb90ee5da93
parent44e45e8423f1a8590009456dc48cda1164d90aed
parente4182bbb80ab1d1255f69c3060442fd7cf841951
Merge branch 'dev' into advancedAPI2

Fixed conflic in zstd_decompress.c
lib/compress/zstd_compress.c