diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:53 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:53 +0200 |
commit | d6d4d364420e8c57a53f25ccb6eae13f86244c80 (patch) | |
tree | 4cb3ddfee7703fe1ce70bc60218c046c30634f09 /src/plugins/sensors/simulator/simulatorirproximitysensor.cpp | |
parent | 7deae40b87e1637d55de8d111e99f4da1d5584d4 (diff) | |
parent | ea21a76606259eca44e2b4f7d42c2127950c2987 (diff) | |
download | qtsensors-d6d4d364420e8c57a53f25ccb6eae13f86244c80.tar.gz |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Change-Id: I054907f7b62430f7fea67384cbffc43a06569fa8
Diffstat (limited to 'src/plugins/sensors/simulator/simulatorirproximitysensor.cpp')
0 files changed, 0 insertions, 0 deletions