diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-25 10:30:35 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-25 10:30:35 +0200 |
commit | 3690925021c60378bb1d21e9102f7f8aa8627716 (patch) | |
tree | d5f4f3fdec8fc6303b819c9cf0be7f41802c6175 /src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp | |
parent | 6bfbe89acce1cdbb14ec0d69d80e5be4b7c3a0d2 (diff) | |
parent | facae1ad357a80859da51f52f49db8c53d2e89be (diff) |
Merge remote-tracking branch 'origin/5.3.1' into 5.3
Change-Id: I04906f381fefa4a60e4a31021d282253a632f833
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp')
0 files changed, 0 insertions, 0 deletions