Skip to content
GitLab
Commit 8987ca00 authored by Liang Qi's avatar Liang Qi Committed by The Qt Project
Browse files

Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6

parents 0228a5bd 71728d12
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 5 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