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

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

Conflicts:
	src/imports/qtcanvas3d/canvas3d.cpp

Change-Id: Iefff63ec23e8ea43deaa76c20b50d196bce628ba
parents c9c85831 9a714258
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 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