diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-16 13:53:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-16 13:53:47 +0100 |
| commit | 57465cedf68a98d6705191282007c7aae44c3148 (patch) | |
| tree | fd967a7a511486d4a415e490395889aafebc48cd /src | |
| parent | dd78067d7cc5a6f3489de9eea74c9d639ec5b7e9 (diff) | |
| parent | 722194f5cdfc04a1be875249507067f913ab2776 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/imports/sensors/plugins.qmltypes
src/imports/sensors/sensors.cpp
Change-Id: Ie32ebca5f509ca3dd6ace9b782247fe612ad00f3
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions