Skip to content
GitLab
Commit 901a00d5 authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.5' into dev 

Conflicts:
	src/compositor/wayland_wrapper/qwloutput.cpp

Change-Id: I05f7431aca46760f90632dfa7ef9c4d0abf392ec
parents 2a975049 f0e852e5
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 259 additions and 60 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