From: DRC <information@libjpeg-turbo.org>
Date: Wed, 14 Feb 2018 20:50:04 +0000 (-0600)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=985ef4f9f131d4303f4cfb447c91792d99fac3af;p=libjpeg-turbo

Merge branch 'master' into dev
---

985ef4f9f131d4303f4cfb447c91792d99fac3af
diff --cc README.md
index 80ba6c1,74e6eac..80ba6c1
mode 100755,100644..100644
--- a/README.md
+++ b/README.md