diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:39 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:39 +0200 |
| commit | f07fe1f385459d73b16b3a39ae1e9c89d7f22194 (patch) | |
| tree | 64ff28fe2127218d602f220ce476f978b109ab1c /LICENSE.LGPL3 | |
| parent | 1177844a1837ea4b9f61c1bbdcd5bdba11c0ad19 (diff) | |
| parent | 23ec215316df6645ed84885a4c32719ba83d64b2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: Ib2a417a6482e5c34f403968313e3285b3a54e30d
Diffstat (limited to 'LICENSE.LGPL3')
0 files changed, 0 insertions, 0 deletions