Skip to content
Snippets Groups Projects
Commit 10a083c1 authored by con's avatar con
Browse files

Merge branch '0.9.2-rc1' 

Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
parents f679e80c fc8762e6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 102 additions and 35 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