summaryrefslogtreecommitdiffstats
path: root/src/imports/sensors/qmltiltsensor.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-12 16:31:30 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-12 16:32:04 +0200
commit15e924486a410780fefbc5a95fae8886e3190925 (patch)
treec6d784f1c528a0fe75367db415240fc4dfe5c73a /src/imports/sensors/qmltiltsensor.cpp
parentea7af7f00886f77941b81262e597c3b7f3477f48 (diff)
parent4c29e9149a583b48e563ad44b59666a9d45f9347 (diff)
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts: src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp src/sensors/qcompass.cpp Change-Id: Idfcbbfe1757a4b827663453abc27f4026cd3d752
Diffstat (limited to 'src/imports/sensors/qmltiltsensor.cpp')
0 files changed, 0 insertions, 0 deletions