diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:08:10 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:08:10 +0100 |
commit | 01e97935c61498adb650d2e639ac8948a5e67a8f (patch) | |
tree | 46f122dd2ba55acd3bc257811c572c4349500c28 /src/imports/sensors/sensors.pro | |
parent | a0ba97f918666d46c20964dd2033b407446c4436 (diff) | |
parent | 971fc95eca1d9db93aa4bdb75793dfe83e4a97db (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Icf78a6052ee367ea11638443dd4cf7ecfaf606e3
Diffstat (limited to 'src/imports/sensors/sensors.pro')
0 files changed, 0 insertions, 0 deletions