diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-12-11 09:28:21 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-12-11 09:28:21 +0100 |
| commit | 57d4ea4dccffa3ff110037574efb1c5d80df4a02 (patch) | |
| tree | 8f4476ab6a7034ff4a6bcc57c470a214ef37d6f9 /src/shared | |
| parent | 7ec55f89f1193794eab4fb283e38bdc1d9c3b0dc (diff) | |
| parent | ee75c7276b9ba9fc01f0182d45547038567b6e93 (diff) | |
Merge remote-tracking branch 'origin/12.0'
Conflicts:
src/plugins/designer/formeditor.cpp
src/plugins/git/gitplugin.cpp
Change-Id: I554a844fab4c55249a00f394f9ba174c7548dbbe
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 36e230e0bafdbe11bd31bd294ae745403c553c7 +Subproject b1d6a0518a38bf37928233d31f764132081f85e |