tree 1971cf6701eba796aa4f1a9951e33077ef7f1385
parent c7dd1912716d571352cce8c948825d763620553f
parent 02227e48a990911a6da35ab8034911a9fbc1055a
author DRC <information@libjpeg-turbo.org> 1604969721 -0600
committer DRC <information@libjpeg-turbo.org> 1604970148 -0600

Merge branch 'master' into dev