diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 09:41:07 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 09:41:08 +0100 |
commit | 904aa931871fe2ebe5cc6b14a55f37658e15ee89 (patch) | |
tree | af3c1cd4286d8c34deaba9e5bdea41925bcc3c01 /src/3rdparty/libtiff/libtiff/tif_error.c | |
parent | 2f61f401187d55bb0304591f27792a63a38db00e (diff) | |
parent | 335dc6af7d24c1731cbd7e03a21e66c70d81760d (diff) |
Merge remote-tracking branch 'origin/5.11.3' into 5.11
Change-Id: I5ef5083941390a0b9d9fe59b63a744e5a1aecf18
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_error.c')
-rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_error.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_error.c b/src/3rdparty/libtiff/libtiff/tif_error.c index 47516b4..651168f 100644 --- a/src/3rdparty/libtiff/libtiff/tif_error.c +++ b/src/3rdparty/libtiff/libtiff/tif_error.c @@ -1,5 +1,3 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.6 2017-07-04 12:54:42 erouault Exp $ */ - /* * Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. |