Skip to content
Snippets Groups Projects
Commit 6503099b authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0' 

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/bineditor/bineditorplugin.cpp
parents d209bd72 4245b4ab
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 371 additions and 675 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