diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-09-20 14:31:55 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-28 15:22:04 +0000 |
| commit | f2f61da519a38d85172140b5e19df057be032996 (patch) | |
| tree | ab47385290cacc5c5c74bc757e964233255bbb36 | |
| parent | c9b23b6d282e5b4e1cc596083ec11ed26cf8dcdf (diff) | |
Update the COPYRIGHT.txt file
With the contents from src/jversion.h
Change-Id: I3d4d2b40b3ed6576655b97b1709ee42c9c81ebe7
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit fbd3b00e0b342b9291ee5cb60d3611e3878c6a7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/3rdparty/libjpeg/COPYRIGHT.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/libjpeg/COPYRIGHT.txt b/src/3rdparty/libjpeg/COPYRIGHT.txt index 6d80d7dc77..cfeb0eacfc 100644 --- a/src/3rdparty/libjpeg/COPYRIGHT.txt +++ b/src/3rdparty/libjpeg/COPYRIGHT.txt @@ -1,6 +1,6 @@ Copyright (C) 2009-2021 D. R. Commander Copyright (C) 2015, 2020 Google, Inc. -Copyright (C) 2019 Arm Limited +Copyright (C) 2019-2020 Arm Limited Copyright (C) 2015-2016, 2018 Matthieu Darbois Copyright (C) 2011-2016 Siarhei Siamashka Copyright (C) 2015 Intel Corporation @@ -9,4 +9,4 @@ Copyright (C) 2013-2014 MIPS Technologies, Inc. Copyright (C) 2009, 2012 Pierre Ossman for Cendio AB Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies) Copyright (C) 1999-2006 MIYASAKA Masaru -Copyright (C) 1991-2017 Thomas G. Lane, Guido Vollbeding +Copyright (C) 1991-2020 Thomas G. Lane, Guido Vollbeding |