diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-10-27 14:39:28 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-10-27 14:23:53 +0000 |
| commit | 52dd6b1e9a3fe249b153bdcebe08455ff716309d (patch) | |
| tree | 087f97688caaef613608b72fd0744bc73f66fe18 | |
| parent | 99d9e0c527ad91f186628ece1c8b3a5ec07f7add (diff) | |
libtiff: Replace BSD advertising clause
Replace strtoull.c from libtiff with version in qtbase that has
an updated license without advertising clause.
Change-Id: I3ffdb8799adc6ef18c60021d2d2fe222df1c2acd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/3rdparty/libtiff/port/strtoull.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/3rdparty/libtiff/port/strtoull.c b/src/3rdparty/libtiff/port/strtoull.c index fb7739c..c37ee16 100644 --- a/src/3rdparty/libtiff/port/strtoull.c +++ b/src/3rdparty/libtiff/port/strtoull.c @@ -2,6 +2,11 @@ * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * + * Copyright (c) 2011 The FreeBSD Foundation + * All rights reserved. + * Portions of this software were developed by David Chisnall + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,11 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * |