commit | 2ac4e9d914353eac83b2395ee992a1c262489bb0 | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Mon Jun 26 21:58:32 2017 -0500 |
committer | DRC <information@libjpeg-turbo.org> | Mon Jun 26 22:03:32 2017 -0500 |
tree | d2ebeae13ad0b531119c4f0a189b04c87b510810 | |
parent | 44b2399a940869920b659f3cdbfc32ffecb37364 [diff] | |
parent | 6a2b06742818e7d505738f35b9b589a958f98f0a [diff] |
Merge branch 'master' into dev