diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:44:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:45:07 +0100 |
| commit | 1399a77954ec4b40fa14b75218e046e76d1324bc (patch) | |
| tree | a1ac141e729b5d8fb58aa0504a8d751a9348473e /LICENSE.LGPLv3 | |
| parent | 44a449ff8f0b7cdb71e67385e1bd9a098209045e (diff) | |
| parent | b65de45fbfa08d0d2d5b89df77181d3726598097 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Ibcb5508d7f131cbeba0d047111177a8dff1e5f68
Diffstat (limited to 'LICENSE.LGPLv3')
0 files changed, 0 insertions, 0 deletions