diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-20 19:37:06 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-20 19:37:06 +0100 |
| commit | 0c839f87fb7d35ca13035d5b1b8d241310aab2c7 (patch) | |
| tree | ca62713f08f006078ee4999aac9e7526611c8b73 /qtconnectivity | |
| parent | 2a4eafbc77d7cf60c4cef17b165e05d1c1d5267b (diff) | |
| parent | a9a4b97c7041e03d9833c0acfabd37576ae92306 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
coin/provisioning/common/unix/mqtt_broker.sh
Change-Id: I990dbf66b7120f2f1bcf202f0a2547a5ad9881f2
Diffstat (limited to 'qtconnectivity')
0 files changed, 0 insertions, 0 deletions