aboutsummaryrefslogtreecommitdiffstats
path: root/tests/manual/docker/android
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2024-05-21 09:40:46 +0200
committerEike Ziller <eike.ziller@qt.io>2024-05-21 09:40:46 +0200
commit90b3068ecfec7812c0317e77ded14d5b704a5b89 (patch)
tree60c324708224cc3788139f3509d370a6d8ea2491 /tests/manual/docker/android
parenta46fc4e8a2c36599d1975a09d86758b22f271545 (diff)
parent85617f1369e2638d47c1b583650200bd4805ddb3 (diff)
Merge remote-tracking branch 'origin/13.0'HEADmaster
Conflicts: doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc Change-Id: If93df2592a66679eeff9c8a337372e3aad65f1f1
Diffstat (limited to 'tests/manual/docker/android')
0 files changed, 0 insertions, 0 deletions