diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-27 12:43:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-27 12:43:22 +0100 |
| commit | 2d0e6b81ddabbaa1dad257c47e40ee758af17b39 (patch) | |
| tree | 1ed1ec9e62afb4001326c9126cd4d5472761c58f /qtwayland | |
| parent | 4e99a6976cae711cb4d456d137088b2acb99f96f (diff) | |
| parent | 1c6f272dd0a0a43af85428efbe6d640a7a9803f6 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
coin/provisioning/common/windows/android-openssl.ps1
Change-Id: I0755066ece5458040a21b3da6ddbc1656240f5bb
Diffstat (limited to 'qtwayland')
0 files changed, 0 insertions, 0 deletions