diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:00:03 +0200 |
| commit | c0fe554f498025067edd78e75e3efb46868f8fe6 (patch) | |
| tree | 00b468e1a38f186f908e1c0c9dcca0c183736c3e /src/plugins/sensors/dummy | |
| parent | 9a1b163e1fdd99a838c082805c687205b766da25 (diff) | |
| parent | 2ff8f06e71d5eeb40cbdebc104c00073a3c2871a (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Iac052b07a815ed6bcaea42109895e323342c5d71
Diffstat (limited to 'src/plugins/sensors/dummy')
0 files changed, 0 insertions, 0 deletions