diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-09-07 08:56:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-09-07 11:05:40 +0200 |
| commit | 8e51295959a27faad5812868e33d6b9368e175b9 (patch) | |
| tree | d72f087188c09a083df74395361154befad68b27 /src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp | |
| parent | d739ba8a7d07fea8ba3aef6cd470a4f6a02b7b7c (diff) | |
| parent | 93857c279ca2daa6460eca34e49dd0cca26521c7 (diff) | |
| download | qt-creator-8e51295959a27faad5812868e33d6b9368e175b9.tar.gz | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
src/libs/utils/processreaper.cpp
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
Change-Id: Ie248bcb02a80f3e02ab19d73033ce2ba31e7fd83
Diffstat (limited to 'src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp')
0 files changed, 0 insertions, 0 deletions