| commit | 7e0d94d3a7befd9a31bdf0608f7df0a64f5e2607 | [log] [tgz] |
|---|---|---|
| author | DRC <information@libjpeg-turbo.org> | Tue Nov 24 20:31:51 2020 -0600 |
| committer | DRC <information@libjpeg-turbo.org> | Tue Nov 24 20:31:51 2020 -0600 |
| tree | 4824d96050ceb62deb495cca40d22429737dadb7 | |
| parent | 6d91e950c871103a11bac2f10c63bf998796c719 [diff] | |
| parent | 1c839761cfe1f6e9c535200dc6e68d57a1c48ff0 [diff] |
Merge branch 'master' into dev
diff --git a/.gitattributes b/.gitattributes index 2948038..23fbb88 100644 --- a/.gitattributes +++ b/.gitattributes
@@ -3,3 +3,4 @@ /ci export-ignore /.gitattributes export-ignore /.github export-ignore +*.ppm binary