commit | fa3bdfb7bccbb4dd9676dee7a1208127e2b48508 | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Fri Oct 07 05:47:35 2016 -0500 |
committer | DRC <information@libjpeg-turbo.org> | Fri Oct 07 05:47:35 2016 -0500 |
tree | 11571301fbbaf416d2fcc472cbf350678ac50461 | |
parent | 7884e245bc9ec4667623793c6a359d1bf199b607 [diff] | |
parent | b47c5e737fab1395437200c0623019cbd10777dd [diff] |
Merge branch 'master' into dev