diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:05:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:05:14 +0100 |
| commit | f15b2e266094edac11c3825c1df42396b6a76a6c (patch) | |
| tree | 4982f5cf52843c48892aede42ac57ea271404811 /tests | |
| parent | 5aad7c5de78c4768ee5c731f4a1dc686dbc3abd5 (diff) | |
| parent | c25d62cc83b9e8daa8c9b7fd6c03782b500093db (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/bluetooth/bluetooth.pro
Change-Id: Ied68947463e7eba418386a99903131d2cbdd458b
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions