diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-18 15:25:35 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-18 15:25:35 +0200 |
| commit | 556d900877811c985bcd671d407bb50ccc7a3858 (patch) | |
| tree | 4cbb1797c00918aa6fa1e71edb2335da039c960d /src/plugins/sensors/generic/main.cpp | |
| parent | 96efb156c0b0af3d2b2a549165245182073f2b05 (diff) | |
| parent | 15e924486a410780fefbc5a95fae8886e3190925 (diff) | |
| download | qtsensors-556d900877811c985bcd671d407bb50ccc7a3858.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I4a589c2f9005f6bfd9242e335387ec690e97210a
Diffstat (limited to 'src/plugins/sensors/generic/main.cpp')
0 files changed, 0 insertions, 0 deletions