diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:36:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:36:23 +0200 |
| commit | 8698282befc874bd38862558350f3f1993ba0053 (patch) | |
| tree | 71d03cadce14ee59dc64cab13b5910a0e6e07f1a /src/plugins/sensors/android/src/main.cpp | |
| parent | 20a4655188bc86b34a58761f047f046229cf46c6 (diff) | |
| parent | 6189199557a2b8eb981f37e6370b47c25b224b4e (diff) | |
| download | qtsensors-8698282befc874bd38862558350f3f1993ba0053.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I6c75a1a2f39fc3490087c1bad07325c79b0c79d2
Diffstat (limited to 'src/plugins/sensors/android/src/main.cpp')
0 files changed, 0 insertions, 0 deletions