summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/sensorfw
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@texla.cl>2015-02-22 14:22:39 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-02-22 14:22:39 +0000
commitf082ef6ed0bab0fb8007790fbc08d3ab19378473 (patch)
treeab523d9a9543e3980bd1c0929937f66721aad6e3 /src/plugins/sensors/sensorfw
parentb81ad50d2c5748fb5357d82121b24d03c40654e8 (diff)
parente608b695cc183c9076a0ee3883d392990c023e02 (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/sensors/sensorfw')
0 files changed, 0 insertions, 0 deletions