diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-20 10:50:46 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-20 10:50:53 +0200 |
commit | fa01244e5233c7c1f7a862121c079bff2d8e055c (patch) | |
tree | 71d03cadce14ee59dc64cab13b5910a0e6e07f1a /src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp | |
parent | f32489e379805c51b28ae5d471491a649283fd8d (diff) | |
parent | 8698282befc874bd38862558350f3f1993ba0053 (diff) |
Merge remote-tracking branch 'gerrit/5.7' into 5.7.0
Change-Id: I2568fef18d7edbf4377739920538ee2ec4c8ec22
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp')
0 files changed, 0 insertions, 0 deletions