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

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

parents 0504f954 031935bf
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 4 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