From: Yann Collet <cyan@fb.com>
Date: Tue, 30 May 2017 23:18:57 +0000 (-0700)
Subject: Merge branch 'dev' into advancedAPI2
X-Git-Tag: v1.3.0~1^2~17^2~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb62b15a8e10dd729f56fb6ad011f38c8f63da0;p=thirdparty%2Fzstd.git

Merge branch 'dev' into advancedAPI2

Fixed conflic in zstd_decompress.c
---

beb62b15a8e10dd729f56fb6ad011f38c8f63da0