diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:26:03 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:26:03 +0200 |
| commit | 0520efecf2c8442e3a4870412243fd7cedb3c387 (patch) | |
| tree | b83b360f21ca381828980b84ae47bfb727af3c59 /src/sensors/qsensor.cpp | |
| parent | 2701763c003e9d2cc59a936491ab2fa8b6ff7f74 (diff) | |
| parent | 3690925021c60378bb1d21e9102f7f8aa8627716 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I01306a5c0d34f85efdbc5f947add4dee0cccbf8e
Diffstat (limited to 'src/sensors/qsensor.cpp')
0 files changed, 0 insertions, 0 deletions