Skip to content
Snippets Groups Projects
Commit 26e191aa authored by Ben Boeckel's avatar Ben Boeckel
Browse files

Merge branch 'upstream-jpeg' into HEAD

* upstream-jpeg:
  jpeg 2018-12-31 (68d2641e)
parents f7943bc4 ae80ae68
No related branches found
No related tags found
No related merge requests found
Showing
with 795 additions and 679 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment