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

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

 Conflicts:
	configure.json
	configure.pri
	src/3rdparty

Change-Id: I2e0614b33596fe66999508556c464ed84acc8e2f
parents 32b67aea dd7c3f92
Hide whitespace changes
Inline Side-by-side
Showing
with 71 additions and 8 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