diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 03:01:12 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 03:01:12 +0100 |
commit | 3f28dbc2f911c5a228a807486a56d4dcd87a0a0e (patch) | |
tree | 77d5dda4818c8dbde9c4e1cbedc8f6bf1113cecb /src/imports/sensors/qmlirproximitysensor.h | |
parent | 1579f19830443484c4c51d6924a5b141b4e816e4 (diff) | |
parent | fca92f5d465be1c3701545a716dd91db27a2093c (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I100de7289027dbc97f714ec1cd01b67f6b174b94
Diffstat (limited to 'src/imports/sensors/qmlirproximitysensor.h')
0 files changed, 0 insertions, 0 deletions