commit | d34d255957051d0f5a7ce836b87cd4d4a47ad94e | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Thu Jan 19 19:05:21 2017 -0600 |
committer | DRC <information@libjpeg-turbo.org> | Thu Jan 19 19:05:21 2017 -0600 |
tree | 3ee0e2aae45ec279246a298451e02ac621f8829f | |
parent | 2fb4d7e337cfadd3db8fb08ba925361c2b57cfc9 [diff] | |
parent | a0b7de9a47358a19b31db447dbf02b488463eb7e [diff] |
Merge branch 'master' into dev