diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:47:35 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:47:35 +0200 |
| commit | 9efc5bea41e7acbce55c37b49b167092b71114a9 (patch) | |
| tree | 4c13d95e1d44f68a24fb391108847d2c68efcd97 /src/plugins/sensors | |
| parent | 606e40570be5af8d9f05c55affedd6b106889bf7 (diff) | |
| parent | 43e7f32c776ceebe60416524510e70afa3c9a8d9 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I47951d3d277c1d2fc45a7ec36cc01d677ffec7cb
Diffstat (limited to 'src/plugins/sensors')
0 files changed, 0 insertions, 0 deletions