commit | bd544e284ba7d385bdab743148c94cb76f09a49c | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Sat Dec 16 09:34:28 2017 -0600 |
committer | DRC <information@libjpeg-turbo.org> | Sat Dec 16 09:34:28 2017 -0600 |
tree | 8dde7bda726aaa2439db58bdc067a4d34455baf0 | |
parent | afdd7999e4a5c072b7df8a235f97f087e8afb6aa [diff] | |
parent | 0e2bca0744feaf74509818f950120dceff8e28d0 [diff] |
Merge branch 'master' into dev