tree 8528261b6f501b129d527ad15c2366b145676e4c
parent c94531212fe4f460ce00e22a12fd522bb71c3d7a
parent 02fa8f244e549edd3f3acf174b97157590d1b71e
author DRC <information@libjpeg-turbo.org> 1504231039 -0500
committer DRC <information@libjpeg-turbo.org> 1504267971 -0500

Merge branch 'master' into dev