diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-04-01 08:42:30 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-04-01 08:43:02 +0200 |
| commit | c333d25a2a89aeefa936810945fe965cf1086797 (patch) | |
| tree | 92ed5df4adb8e4fc105f8a20f74a485686165aa3 /src/sensors/qirproximitysensor.cpp | |
| parent | 67bc52239aba6daa7f9b7659cc05074635fde7e2 (diff) | |
| parent | 767f33d8c657f194d6d2e33f87ff9fc4560b30fe (diff) | |
Merge remote-tracking branch 'gerrit/5.4' into 5.5
Change-Id: If6f44fe2cd69bae92cddd4682e952f2528b85184
Diffstat (limited to 'src/sensors/qirproximitysensor.cpp')
0 files changed, 0 insertions, 0 deletions