diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-10-01 13:15:54 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-10-01 13:16:30 +0200 |
| commit | f835812b24b47f1d5a6766fd227ca32559295129 (patch) | |
| tree | 092975324fc7a828f74228f742d1d8dd012f23d1 /src/bluetooth/qbluetoothserviceinfo_osx.mm | |
| parent | 48e81b139729b58e3c72ab82f2d1642eefc3a047 (diff) | |
| parent | 22042412de27c2fedec852051fe7fffcaf431a2e (diff) | |
Merge branch '5.4' into btle
Change-Id: I3c00855a33c1015d159a67e5548fd29164668929
Diffstat (limited to 'src/bluetooth/qbluetoothserviceinfo_osx.mm')
0 files changed, 0 insertions, 0 deletions