diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:33:52 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:33:53 +0100 |
| commit | 5441a4cc3068eec15f01942331dc1aa094883963 (patch) | |
| tree | 00ed24a914a8deab9e42c524a750263aafc21589 /dependencies.yaml | |
| parent | 31bc73eaf81b1120be54ae77a65bedc602ab2320 (diff) | |
| parent | 2eba1572ee49c22f4734b1fb80aa8023d60a8e70 (diff) | |
| download | qtsvg-5441a4cc3068eec15f01942331dc1aa094883963.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Icdd813d576712aa52d6c7a1c5600882b4286f2ac
Diffstat (limited to 'dependencies.yaml')
0 files changed, 0 insertions, 0 deletions