commit | c454c595dc83028770727fdb7eac7842875465ac | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Thu Feb 04 18:46:13 2016 -0600 |
committer | DRC <information@libjpeg-turbo.org> | Thu Feb 04 18:46:13 2016 -0600 |
tree | 37a33c33a4fa6100b4fafd3c8cc72c66403818bf | |
parent | 57e206662a40075e36cc2ae457b502784439cf75 [diff] | |
parent | 0463f7c9aad060fcd56e98d025ce16185279e2bc [diff] |
Merge branch '1.2.x' into 1.3.x