diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-16 14:39:29 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-16 14:39:29 +0200 |
commit | b11d8d673ba36ab22c0d7a40ea53d57f284cca13 (patch) | |
tree | f370841deac0b5516fa458a910f508d592a6cc36 /src/sensors/qlightsensor_p.h | |
parent | 478ec8819427f783cba05601779cfce9dba1d55c (diff) | |
parent | a16f81a365b7d9a6629b04bd298a3b45fc1b7628 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia02497aafc94feba0381ffe8733cbc89f29fb412
Diffstat (limited to 'src/sensors/qlightsensor_p.h')
0 files changed, 0 insertions, 0 deletions