diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:44:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:07:52 +0100 |
| commit | e5c4a6f82b83a1bf27380c071e822d5303642824 (patch) | |
| tree | 5f16389c799eba64ea581ac63ee9d6b4da8bb3c1 /src/3rdparty/libtiff/port/strtoul.c | |
| parent | 36fdeb50941e3e2b0c4cd1b3343c3e337534357d (diff) | |
| parent | feca51d8c714781378cecc99122035348e0459bb (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I84737121b8915a6c358ad92246984749e2719bed
Diffstat (limited to 'src/3rdparty/libtiff/port/strtoul.c')
| -rw-r--r-- | src/3rdparty/libtiff/port/strtoul.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libtiff/port/strtoul.c b/src/3rdparty/libtiff/port/strtoul.c index f7a9a1a..84ab215 100644 --- a/src/3rdparty/libtiff/port/strtoul.c +++ b/src/3rdparty/libtiff/port/strtoul.c @@ -1,4 +1,4 @@ -/* $Id: strtoul.c,v 1.2 2005/07/07 16:34:06 dron Exp $ */ +/* $Id: strtoul.c,v 1.2 2005-07-07 16:34:06 dron Exp $ */ /* * Copyright (c) 1990, 1993 |