Skip to content
GitLab
Commit f15b2e26 authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.6' into 5.7 

Conflicts:
	src/bluetooth/bluetooth.pro

Change-Id: Ied68947463e7eba418386a99903131d2cbdd458b
parents 5aad7c5d c25d62cc
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 11 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment