diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:47:08 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:47:08 +0300 |
| commit | 533f147b297d716f1f995054c925917bbb0f4bb9 (patch) | |
| tree | 68d8813833ce867bcd5f4e200584876eebb93881 /src/sensors/qsensormanager.cpp | |
| parent | cc8c26d77db10eef152432caf3f8e677c0fffb21 (diff) | |
| parent | 8b11ddef023a18d362a9b09eb794c3eee9c2d958 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I6b203a32b2f52255ae4e63cfb279e762458c0128
Diffstat (limited to 'src/sensors/qsensormanager.cpp')
0 files changed, 0 insertions, 0 deletions