]> granicus.if.org Git - libjpeg-turbo/commitdiff
Merge branch 'master' into dev
authorDRC <information@libjpeg-turbo.org>
Fri, 7 Oct 2016 09:51:29 +0000 (04:51 -0500)
committerDRC <information@libjpeg-turbo.org>
Fri, 7 Oct 2016 09:51:29 +0000 (04:51 -0500)

Trivial merge