diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-18 03:00:37 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-18 03:00:37 +0100 |
commit | be53414956ddcdf3174793d8cf64327d5c6e13d7 (patch) | |
tree | 151d99db2ddfdc25a2aada9d48c4d5a38a1a70f3 /src/bluetooth/qbluetoothserver_osx.mm | |
parent | d3eb54e30943a69c469732f9184cbbad944fef28 (diff) | |
parent | 00f7f8514f3415bb68d964af18482f47c0d5c94d (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4579c24569c9d30896026703df85cb3eeafa945d
Diffstat (limited to 'src/bluetooth/qbluetoothserver_osx.mm')
0 files changed, 0 insertions, 0 deletions