Skip to content
Snippets Groups Projects
Commit 1fd12ab6 authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0' 

Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
parents 64d65fb6 acea722d
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 514 additions and 341 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