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

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

Conflicts:
	src/client/qwaylanddisplay.cpp
	src/client/qwaylanddisplay_p.h
	src/client/qwaylandxdgpopup_p.h

Change-Id: If86ea09971773dc6c541f07819459a90e8ab73a0
parents 061ed459 1bc3b0fd
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 831 additions and 57 deletions
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