commit | 4e240795cc33bfad75b30b8bf17e95132842e9b4 | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Tue Feb 13 16:34:21 2018 -0600 |
committer | DRC <information@libjpeg-turbo.org> | Tue Feb 13 16:34:21 2018 -0600 |
tree | 329f6a0be5e365de2dac88916c2495e5affbd72d | |
parent | 289014d470410da01cfc2554a0fa191c0fba1abc [diff] | |
parent | d4859558da447fa81e3891c2e2a2f24191986a08 [diff] |
Merge branch 'master' into dev