diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
| commit | b5c2535eb0da4ad2b65e79df288a3674f3118717 (patch) | |
| tree | 964bd1dfaa9c769878f8195db6d2bce03ef4e5c7 /src/3rdparty/pcre2/LICENCE | |
| parent | 3f25bcd5b7ec0d8a17a3a236099b9049b32b7755 (diff) | |
| parent | 6c0ced4b7a77b089b434ab5eb9f430717f26d687 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty/pcre2/qt_attribution.json
Change-Id: Ibae941cb12662f27bd6962ee02bc235971c59a15
Diffstat (limited to 'src/3rdparty/pcre2/LICENCE')
| -rw-r--r-- | src/3rdparty/pcre2/LICENCE | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/pcre2/LICENCE b/src/3rdparty/pcre2/LICENCE index b0f8804fff..142b3b3f9a 100644 --- a/src/3rdparty/pcre2/LICENCE +++ b/src/3rdparty/pcre2/LICENCE @@ -26,7 +26,7 @@ Email domain: cam.ac.uk University of Cambridge Computing Service, Cambridge, England. -Copyright (c) 1997-2018 University of Cambridge +Copyright (c) 1997-2019 University of Cambridge All rights reserved. @@ -37,7 +37,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Email domain: freemail.hu -Copyright(c) 2010-2018 Zoltan Herczeg +Copyright(c) 2010-2019 Zoltan Herczeg All rights reserved. @@ -48,7 +48,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Email domain: freemail.hu -Copyright(c) 2009-2018 Zoltan Herczeg +Copyright(c) 2009-2019 Zoltan Herczeg All rights reserved. |