diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-03-13 12:30:04 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-03-13 12:30:04 +0100 |
| commit | c7e94d80c718be7d8e89f3d64ef7b2843a434343 (patch) | |
| tree | c48f68a82c2040d7640e7c6ca1b6c49693965f62 /src/shared | |
| parent | f1d50c0d550fa5d8701d165b005ffce8cb59df44 (diff) | |
| parent | 4d2b448541cfa44ee385c9da6249be67c90330e5 (diff) | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
src/shared/qbs
Change-Id: I33e13270c8c15a51b4ce4eaa6b4584041ed124e0
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 7cbd3803c32ed8c0141e9dd3d116df3d84d72e8 +Subproject 1a6cfb0af220926f8b00219c5dd7feb36bcaa0d |