diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-08-29 08:47:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-08-29 08:47:29 +0200 |
| commit | a3ef2a6d0048b9d7814ef594a823cf0f00732df7 (patch) | |
| tree | 9404b9aa868948e3cdc054f1849c5c49d606bdf9 /src/shared | |
| parent | aa7c817f7a711b260dae3d0a5b02fc19b1b25179 (diff) | |
| parent | b50617914561c2151008fd912868e45104fa6340 (diff) | |
Merge remote-tracking branch 'origin/11.0'
Conflicts:
src/plugins/projectexplorer/miniprojecttargetselector.cpp
Change-Id: Ie831644eb1c69beed6791cbc67cbfb9309dcd351
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 d8c97a5f0b1f85e79829dbcc63b82bc5b1d8323 +Subproject b4c7d6078c2eed3d655e8eb074bf1dca6a93f0e |