summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/sensorfw/Sensors.conf
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-21 08:34:05 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-21 08:34:05 +0200
commit53a414e33ce45f28b89217678597416b681128d4 (patch)
tree51ab26cf4a14662e525c4a648d84dae81090f0c7 /src/plugins/sensors/sensorfw/Sensors.conf
parent3523afa703792fabc8bac3febe5541766bc1ccd4 (diff)
parentdf3374bd4bb8af1494f6a35b1102f15cfe9633e0 (diff)
Merge remote-tracking branch 'origin/5.8' into dev
Diffstat (limited to 'src/plugins/sensors/sensorfw/Sensors.conf')
0 files changed, 0 insertions, 0 deletions