commit | c05d124968b36631a2f9899436f9e11180a2e28e | [log] [tgz] |
---|---|---|
author | DRC <information@libjpeg-turbo.org> | Wed Nov 29 14:36:39 2017 -0600 |
committer | DRC <information@libjpeg-turbo.org> | Wed Nov 29 14:36:39 2017 -0600 |
tree | 434bbfdfb8cada8c9ac579c488abd4fd80e5a695 | |
parent | 9f1f86bf7f6555e56e69fca4ecf002bf7041194c [diff] | |
parent | a831b5a9862f788ec5c474e0d8c64def87cb8659 [diff] |
Merge branch 'master' into dev