diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-14 14:15:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-14 14:15:54 +0200 |
| commit | c273b642ff142e4d567a62c558e9564d6d8defa4 (patch) | |
| tree | cdfeeb4a03ab78161eb6fcf35806312897de88ee /tests | |
| parent | db56df7fb05b465bf0e77dd086fc2a7b054ab1d9 (diff) | |
| parent | 245f19122c2a6a112a35ee65556bcf00b6545d87 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2
Conflicts:
src/bluetooth/doc/src/bluetooth-index.qdoc
Change-Id: If353b4ac63c72d6f94415e1349a206ade4ceb52e
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions