Skip to content
Snippets Groups Projects
Commit 7cfa4dbe authored by mae's avatar mae
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 

Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
parents 3b04ed31 f73861d4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 217 additions and 223 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