diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:04:58 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:04:59 +0100 |
commit | ac0f95f6f1d54d689a5f6525b4636634106821f6 (patch) | |
tree | dff8d25f1d8e589bc431e3189f65df5a59713e1b /src/plugins/sensors/sensorfw/sensorfwsensorbase.h | |
parent | 749ae042fec78042f8f5640e21aaaaae43869946 (diff) | |
parent | 63c972ad9e15b673779147c4c263ed2ac5312a28 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I6fad4ad595ae4d0d5f00514bc785bfe69cd84954
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwsensorbase.h')
0 files changed, 0 insertions, 0 deletions