commit | 4893e5d8b82931e384816cac2d54b10bf324f64f | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Fri Nov 17 19:00:53 2017 -0600 |
committer | DRC <information@libjpeg-turbo.org> | Fri Nov 17 19:00:53 2017 -0600 |
tree | 8aabb067205f92db529912a64b85813c3fcfe192 | |
parent | 616b4e2d1b5dba6a431d2875c4cd9c1852c6bb6b [diff] | |
parent | 19b393b62422c97d97de4a5f2943d2cf4dc44120 [diff] |
Merge branch 'master' into dev