commit | c0f3512d5a5d6454c8f72c49a93f9e26b301ccdd | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Thu Aug 31 20:57:19 2017 -0500 |
committer | DRC <information@libjpeg-turbo.org> | Fri Sep 01 07:12:51 2017 -0500 |
tree | 8528261b6f501b129d527ad15c2366b145676e4c | |
parent | c94531212fe4f460ce00e22a12fd522bb71c3d7a [diff] | |
parent | 02fa8f244e549edd3f3acf174b97157590d1b71e [diff] |
Merge branch 'master' into dev