tree 49c89627e1b8fff293e9f4568d41d7eee408ea7b
parent 80acd5c4a721d62a01d2674f45a669bd356d0dba
parent 6367924ac62e72fc97e3105c43eb6bd1ec8eead3
author DRC <information@libjpeg-turbo.org> 1577774573 -0600
committer DRC <information@libjpeg-turbo.org> 1577775522 -0600

Merge branch 'master' into dev