Skip to content
Snippets Groups Projects
Commit 913f6161 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote branch 'origin/1.3' 

Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
parents 43cca5c4 2e82c14a
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4400 additions and 4927 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