]> granicus.if.org Git - libjpeg-turbo/commitdiff
Merge branch '1.4.x'
authorDRC <information@libjpeg-turbo.org>
Thu, 27 Aug 2015 01:31:13 +0000 (20:31 -0500)
committerDRC <information@libjpeg-turbo.org>
Thu, 27 Aug 2015 01:31:13 +0000 (20:31 -0500)
1  2 
turbojpeg.c

diff --cc turbojpeg.c
Simple merge