diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-12-06 16:50:15 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-12-06 16:50:15 +0100 |
| commit | 2e280e1c50d6fb1ac76d84703a060955f0b0a9fa (patch) | |
| tree | 12b0260951cf3bf83ebbfcca1a21d4b22793f3ab /src/shared | |
| parent | 6a97b66592ff0bf76d236f6120cd94e2604283a4 (diff) | |
| parent | d1ac2fe45a9a7986bfb9217f14bfc1ca22a9cdd9 (diff) | |
Merge remote-tracking branch 'origin/12.0'
Conflicts:
src/plugins/clangcodemodel/clangdfollowsymbol.cpp
src/plugins/debugger/debuggerruncontrol.cpp
src/plugins/projectexplorer/miniprojecttargetselector.cpp
Change-Id: I45b7fee1a1d784c44f2139fb1ede69190d23d6fd
Diffstat (limited to 'src/shared')
| m--------- | src/shared/qbs | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 7867c6aaa375e6c7ff3affb67dc6af56df1ecdf +Subproject 36e230e0bafdbe11bd31bd294ae745403c553c7 |