Skip to content
Snippets Groups Projects
Commit 745f82bf authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.8' into HEAD 

Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I59ce346c85803f5496a22bdadf7dca09e59d3174
parents 360366ae 56bdad14
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