diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-08-04 09:31:06 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-08-04 09:31:06 +0200 |
| commit | 7fdbe3bf80d75670223ae1d8fa4d5bac1250bb0c (patch) | |
| tree | de926179b35e8aae031b371683fac43c4a8d3794 /dependencies.yaml | |
| parent | 7f6bd7996d588eab3b371fb369d09bc1a29950c4 (diff) | |
| parent | 86357212fe49dd3471d398a4dc8605c6cdf46406 (diff) | |
Merge remote-tracking branch 'origin/dev' into 6.2
Bring fixes from the dev branch into 6.2. We'll probably
need one final downmerge of dev into 6.2 before moving
over to a regular cherry-picking model.
Change-Id: I47dd493df3379d1ee916dce7be2d48a756bf3668
Diffstat (limited to 'dependencies.yaml')
0 files changed, 0 insertions, 0 deletions