commit | 7884e245bc9ec4667623793c6a359d1bf199b607 | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Fri Oct 07 04:51:29 2016 -0500 |
committer | DRC <information@libjpeg-turbo.org> | Fri Oct 07 04:51:29 2016 -0500 |
tree | 1ad20208109e8edea09cf47a5b4b3449f843618e | |
parent | be908ac0247a2df3d70b385dc64ba719be152140 [diff] | |
parent | 0df2e2188b4608e2560c9cf02e627507c8931766 [diff] |
Merge branch 'master' into dev