Skip to content
Snippets Groups Projects
Commit b59fa0cd authored by hjk's avatar hjk
Browse files

Merge remote branch 'origin/2.0' 

Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/plugins/cppeditor/cpphoverhandler.cpp
	src/plugins/cppeditor/cpphoverhandler.h
parents 088e5fd5 ffdd4110
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3801 additions and 7351 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