diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:25:22 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:25:22 +0100 |
| commit | 1cf8d26f61df6d11b3bc37c2d0a57226df33437d (patch) | |
| tree | a0a21cd0b3a72f288b409248d4751bdf7b4a088c /src/plugins/sensors/dummy/dummycommon.cpp | |
| parent | 51f84fc743112801168b1d5cbb1632c384de565c (diff) | |
| parent | 9a8319a39a06d6cf3163978301d650b8f3558c62 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ie9b09b93307606f8960df4d212e7a08c1a08c0b5
Diffstat (limited to 'src/plugins/sensors/dummy/dummycommon.cpp')
0 files changed, 0 insertions, 0 deletions