diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:25:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 14:07:37 +0200 |
| commit | a56d14f97c4b5aac1ab1cd3e95ce763452ea3e34 (patch) | |
| tree | 4fcf92fddc5496802e9c0a34e81bea7fcc579834 /LICENSE.GPL3 | |
| parent | 4cccbfae21b98afb0cebbce8f586f08e3bef3e52 (diff) | |
| parent | fe63ea126822fae40db90a06ab3be47700e85ec4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I26b1b6de8dc0798d707cb8adce8530238a4d1d98
Diffstat (limited to 'LICENSE.GPL3')
0 files changed, 0 insertions, 0 deletions