Skip to content
Snippets Groups Projects
Commit 173cdff5 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Merge branch '2.0' 

Conflicts:
	src/plugins/cppeditor/cppquickfix.cpp
	src/plugins/mercurial/mercurialjobrunner.cpp
	src/plugins/subversion/subversionplugin.cpp
parents 4f458551 83dba068
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 107 additions and 51 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