commit | 289014d470410da01cfc2554a0fa191c0fba1abc | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Fri Jan 05 12:05:43 2018 -0600 |
committer | DRC <information@libjpeg-turbo.org> | Fri Jan 05 12:05:43 2018 -0600 |
tree | 5fab08a1db4b7c89fc8ce5fc2e706cdd5d1cbe78 | |
parent | bd544e284ba7d385bdab743148c94cb76f09a49c [diff] | |
parent | 3847f91122b790082e3d5d3b6f5f054dc2fbd237 [diff] |
Merge branch 'master' into dev