commit | dedce66eb59968133f4c7e07987317f8ef25c6fe | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Wed Jun 28 15:30:41 2017 -0500 |
committer | DRC <information@libjpeg-turbo.org> | Wed Jun 28 15:30:41 2017 -0500 |
tree | 661da5a362e4ca2d899f392d0abe3b7a7f162db6 | |
parent | aba6ae5950702d85dcc3989d23b2ec5872f6ddc4 [diff] | |
parent | b0971e47d76fdb81270e93bbf11ff5558073350d [diff] |
Merge branch 'master' into dev