diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:00:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:00:01 +0200 |
| commit | 6b5ef56a9f4d92c4a50ce098e9cf323f528b29ee (patch) | |
| tree | 3d3ae905dbf2891d049a41309806c040b16ece7f /src/bluetooth/qbluetoothserviceinfo_osx.mm | |
| parent | 20ab809d4ad00f480e448d64e1890c8856871044 (diff) | |
| parent | bde54c522b76eeb933296aa1a9e159facbf8e529 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I81395f5ecbb7ac3a9eb69a92b5920b0decc2d1fa
Diffstat (limited to 'src/bluetooth/qbluetoothserviceinfo_osx.mm')
0 files changed, 0 insertions, 0 deletions