diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:10:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:10:12 +0100 |
| commit | d3eb54e30943a69c469732f9184cbbad944fef28 (patch) | |
| tree | 4c22ded6a7617684afbc967b8beb44e12667a54b /dependencies.yaml | |
| parent | 39513dcdac9b3e55c62c53431cadde11a0336abb (diff) | |
| parent | 8159beeeb3290dc1c1b44b5a9792e19f272ad785 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I951dbf0b3435602f0a59e47bf11471f0a3b0137e
Diffstat (limited to 'dependencies.yaml')
0 files changed, 0 insertions, 0 deletions