diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:19:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:19:31 +0100 |
| commit | 178b8572d71a34975ffd7ada87227e1b8ed7296e (patch) | |
| tree | 1ca3314f2a20983cd919c7078ae8f20eadb259de /src/3rdparty/libtiff/libtiff/tif_aux.c | |
| parent | 7abea3cc2d4295298e7682c755c4de9f674d55b4 (diff) | |
| parent | 904aa931871fe2ebe5cc6b14a55f37658e15ee89 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Ib84ba922bb21f9e6c52c3096e7ae0fc10025c202
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_aux.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_aux.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_aux.c b/src/3rdparty/libtiff/libtiff/tif_aux.c index 10b8d00..4ece162 100644 --- a/src/3rdparty/libtiff/libtiff/tif_aux.c +++ b/src/3rdparty/libtiff/libtiff/tif_aux.c @@ -1,5 +1,3 @@ -/* $Id: tif_aux.c,v 1.31 2017-11-17 20:21:00 erouault Exp $ */ - /* * Copyright (c) 1991-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. |