From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Fri, 10 Feb 2017 12:38:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/facebook/dev' into mingw
X-Git-Tag: v1.1.4~1^2~72^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=456330948abc0fd597a11e450a393626c73fdcc5;p=thirdparty%2Fzstd.git

Merge remote-tracking branch 'refs/remotes/facebook/dev' into mingw

# Conflicts:
#	programs/platform.h
---

456330948abc0fd597a11e450a393626c73fdcc5