commit | 8a9b042b261bbf0ac779f770701def31489c155c | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Sat Dec 10 09:35:30 2016 -0600 |
committer | DRC <information@libjpeg-turbo.org> | Sat Dec 10 09:35:30 2016 -0600 |
tree | 23c7a8129b1cda2eee8fd4e81b94455fbd14bd0d | |
parent | 11426a871623a6c2c868619eafcf1753ba2bce77 [diff] | |
parent | 64410181509115e259d8f5daa7d9e69e4d968e27 [diff] |
Merge branch 'master' into dev