Skip to content
Snippets Groups Projects
Commit 2667dafc authored by Brad King's avatar Brad King
Browse files

Merge topic 'update-tiff'


aecd9353 Merge branch 'upstream-tiff' into update-tiff
72c79e1b tiff 2018-01-29 (97937610)
f84f1a22 Merge branch 'upstream-jpeg' into update-tiff
e54d698a jpeg 2018-01-25 (36d657e2)
a66b715e jpeg: add .gitattributes file to import
295a2ae1 jpeg: Update vtk_jpeg.h.in for newer libjpeg
2d612600 jpeg: change branch to import so current module system is still used
2164735b jpeg: remove old import
81438f5c jpeg: add an import script
85beacbe tiff: change branch to import so current module system is still used
4d0086b1 tiff: update the import file list

Acked-by: default avatarBrad King <brad.king@kitware.com>
Merge-request: !3823
parents 8bbd2296 aecd9353
No related branches found
No related tags found
No related merge requests found
Showing
with 2230 additions and 1639 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