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

Merge remote-tracking branch 'origin/5.9' into 5.10 

 Conflicts:
	src/compositor/extensions/extensions.pri

Change-Id: Ia9a5bd52b7cac9a4f66e7c5deb43d89f0c792325
parents 06230d22 9f1db9d0
No related branches found
No related tags 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