diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-18 09:20:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-18 09:42:25 +0200 |
| commit | e7472f43087921c3d83ff4452bbdb67ed27ed604 (patch) | |
| tree | 09565f89d0e5b5a702b532b103fe677c1b13edba /qtconnectivity | |
| parent | 92d1bdcb43e988919bfdcb91c0e6f366bed07145 (diff) | |
| parent | 12fd0d5b9b486eaf80712d390265402a3bb06f0e (diff) | |
Merge remote-tracking branch 'origin/5.6.3' into 5.6
Conflicts:
.gitmodules
Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
Diffstat (limited to 'qtconnectivity')
0 files changed, 0 insertions, 0 deletions