diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:01 +0200 |
| commit | a0a8e0395965f0a62ddaaa7c0ad8228aa9990476 (patch) | |
| tree | 620478f2c88d6adc1a3cec5ceeffc4b8420e242e /src/plugins/sensors/simulator/simulatorproximitysensor.cpp | |
| parent | 90f43c450db8cad9f10d86c006f251dad91a4492 (diff) | |
| parent | fa01244e5233c7c1f7a862121c079bff2d8e055c (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ic47f81aec558260a2271485dc953957cbed9ce67
Diffstat (limited to 'src/plugins/sensors/simulator/simulatorproximitysensor.cpp')
0 files changed, 0 insertions, 0 deletions