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

Merge remote-tracking branch 'origin/5.11' into 5.12 

 Conflicts:
	doc/src/platforms/osx.qdoc

Change-Id: I8db563e52f9615f7fa3a070e556368656ba2806f
parents ba9709b4 f11e4a9a
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 78 additions and 0 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