diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:44:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:58:30 +0200 |
| commit | c2b553784dfbe0ece90f79709639e27e74359a7d (patch) | |
| tree | 04b0c74c7417a5f1b628d0b18a07f9dd8be1df60 /src/3rdparty/pcre2/LICENCE | |
| parent | 0b373c2e36a68aedf3731fcb3cd84fd010c2d67c (diff) | |
| parent | 8ea0a82a6a771dd76df2d51c6ef3ed966a5b9b45 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qvariant.h
src/corelib/tools/qlist.h
Done-With: Milian Wolff <milian.wolff@kdab.com>
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I6803f7239aa137a51a7467fab7cc7a01302a848d
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. |