commit | f0dd80f2467e7ea2eaef8bc9bfe5fb41648d4105 | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Wed Sep 20 17:13:46 2017 +0000 |
committer | DRC <information@libjpeg-turbo.org> | Wed Sep 20 17:13:46 2017 +0000 |
tree | 6b0ee43d7c0874f5a5b61269419b038de0933600 | |
parent | 7106ffe5f22eb77640c78a76c756a06fe883d445 [diff] | |
parent | 1b385f37f3f166c046b6a73e7d3346eabd36ef76 [diff] |
Merge branch 'master' into dev