commit | 1a8c68ac5b744584e3134cba52084bb0f1900df6 | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Fri Oct 07 12:55:18 2016 -0500 |
committer | DRC <information@libjpeg-turbo.org> | Fri Oct 07 12:55:18 2016 -0500 |
tree | 56abe2ee549b33f9f6161aea7336377440b45ecf | |
parent | fa3bdfb7bccbb4dd9676dee7a1208127e2b48508 [diff] | |
parent | 1ee329d6173f6dd923283c2149872f98aa5c5116 [diff] |
Merge branch 'master' into dev