commit | ed21f4bd03b976e927ac6a5f41f0fc52548ad3b2 | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Wed Oct 05 14:41:14 2016 -0500 |
committer | DRC <information@libjpeg-turbo.org> | Wed Oct 05 14:41:14 2016 -0500 |
tree | dfb9c2fe0bc45245e1b99173823eacc2bf06cb3f | |
parent | f34f2f5bc63633d385b22bb33388d55d5b1b8c37 [diff] | |
parent | 6d22430a3a70e84039a10cfd3efb8d8fc1804d3c [diff] |
Merge branch 'master' into dev