diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:52:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 11:49:13 +0100 |
| commit | 643999d60d3f76e3d24b1c2dca80533a0a0cdb52 (patch) | |
| tree | bd5366cde3979c6339febaf1e98699c684cf2fc9 /examples/bluetooth/lowenergyscanner | |
| parent | 73e02ede397a03108b8cc0d9a7775448145a0682 (diff) | |
| parent | 042e26bccd2e53447229035c2b31cc1ab853335e (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/bluetooth/osx/osxbtledeviceinquiry.mm
Change-Id: Iefec1aafcb81174b0e1e257246ded08841bf3259
Diffstat (limited to 'examples/bluetooth/lowenergyscanner')
0 files changed, 0 insertions, 0 deletions