commit | 2d56acb84083ba17cc26db2eb9c2616db0feb9bc | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Thu Feb 04 18:47:07 2016 -0600 |
committer | DRC <information@libjpeg-turbo.org> | Thu Feb 04 18:48:22 2016 -0600 |
tree | 1ea9d2395c545bf7a38251f860052961d6c5a641 | |
parent | 04dd34c14ed21d36e80447dd988fa1ce4ebe5ac5 [diff] | |
parent | c454c595dc83028770727fdb7eac7842875465ac [diff] |
Merge branch '1.3.x' into 1.4.x