diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-08-11 10:10:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-08-11 10:10:51 +0200 |
| commit | c7168d1063ecb8a409e0fbbab911dead63604626 (patch) | |
| tree | 923afe7eaf77a21f21104bb24605e002d58a8bfd /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | 7be290ec592fa2375ca289731c01490ae1f7f85c (diff) | |
| parent | 21cb0711c4d9bbd9d5d4b32899bf037dc8f1f4db (diff) | |
| download | qt-creator-c7168d1063ecb8a409e0fbbab911dead63604626.tar.gz | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
src/plugins/coreplugin/locator/executefilter.cpp
Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
0 files changed, 0 insertions, 0 deletions