diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-10-26 09:13:24 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-10-26 09:13:24 +0200 |
| commit | e8ba5b75cfb270b8fd661d5d6e3b68f2a98c5e0d (patch) | |
| tree | 905519a8107a9eedf7413c941cc8311f5472bffc /README.md | |
| parent | 712caf10dcadbacda7487a6836f949c7964002f2 (diff) | |
| parent | fbcb45c105b7e8aec5eab382c05774448c1e6e13 (diff) | |
| download | qt-creator-e8ba5b75cfb270b8fd661d5d6e3b68f2a98c5e0d.tar.gz | |
Merge remote-tracking branch 'origin/5.0' into 6.0
Conflicts:
src/plugins/android/androidpackageinstallationstep.cpp
src/plugins/cppeditor/cppmodelmanager.cpp
Change-Id: I3bad38e1cfe717e98209d49461c9813a8e555eff
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -307,8 +307,8 @@ we thank the authors who made this possible: Copyright (C) 2003-2019 LLVM Team - Distributed under the University of Illinois/NCSA Open Source License (NCSA), - see https://github.com/llvm/llvm-project/blob/master/llvm/LICENSE.TXT + Distributed under the Apache 2.0 License with LLVM exceptions, + see https://github.com/llvm/llvm-project/blob/main/clang/LICENSE.TXT With backported/additional patches from https://code.qt.io/clang/llvm-project.git |