diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-18 21:48:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:13:02 +0200 |
| commit | 5391a325eadcee86a494aa96a3f8edae1be55556 (patch) | |
| tree | bf1fac1ecfc8721084850f70b7e98a825c0a2515 /examples | |
| parent | 60d27ebd2977eee384461469053755c6ba36f102 (diff) | |
| parent | 519ac44fbbeed7ab74fc1f733fcf9057075d0946 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3
Conflicts:
src/bluetooth/qbluetoothsocket_bluez.cpp
Change-Id: I37e21b3c636a241a357bc81fc23da51303b94623
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions