summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 23:43:34 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 23:43:34 +0200
commit90f43c450db8cad9f10d86c006f251dad91a4492 (patch)
tree2f4f02df3d6a121645714e73c762308772ab46bc /src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
parent6e7d77219a583e9a9d8ff14f32f9400543cd2add (diff)
parent33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8 (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp')
0 files changed, 0 insertions, 0 deletions