Skip to content
Snippets Groups Projects
Commit dd24398c authored by Liang Qi's avatar Liang Qi
Browse files

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

Conflicts:
	.qmake.conf
	src/compositor/compositor_api/qwaylandquicksurface.cpp

Change-Id: Ic5e4217549c6c08740dba5ac1794d0a8e53f3a47
parents 36ba9b9b bebe9bef
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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