diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 03:01:25 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 03:01:25 +0100 |
commit | 749ae042fec78042f8f5640e21aaaaae43869946 (patch) | |
tree | 972e177d7f17312d298d205b35741dde5dc1adb4 /src/plugins/sensors/generic/genericalssensor.h | |
parent | 3653ca508047f9ed21d99317b6e324c7540e37fa (diff) | |
parent | 36276fc529529e795df62dae8278013bb4493c25 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I4f4ce03d44baa3acf182b182a768e90f4fe4b4d1
Diffstat (limited to 'src/plugins/sensors/generic/genericalssensor.h')
0 files changed, 0 insertions, 0 deletions