diff options
author | Eike Ziller <eike.ziller@qt.io> | 2023-01-05 09:47:06 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2023-01-05 09:47:06 +0100 |
commit | 098c7176788a4a692b1c360e37c07b68a60ae5a1 (patch) | |
tree | eafa1436636da2cd729968f9db04be0d38f0a46f /src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp | |
parent | ea35ed9ffed341884c1465f09d046ccd5f37fa0d (diff) | |
parent | 0a74a1e99e37e6685e627577dd52d4f06e3c2832 (diff) | |
download | qt-creator-098c7176788a4a692b1c360e37c07b68a60ae5a1.tar.gz |
Merge remote-tracking branch 'origin/9.0'
Conflicts:
src/plugins/qtsupport/qtoptionspage.cpp
Change-Id: Ic8ada9fd47f5eb62e751b6188a45b95ddb36122d
Diffstat (limited to 'src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp')
0 files changed, 0 insertions, 0 deletions