Skip to content
Snippets Groups Projects
Commit 16dc17b8 authored by Roberto Raggi's avatar Roberto Raggi
Browse files

Merge branch 'master' of ../master into qmljsinspector 

Conflicts:
	src/plugins/qmlinspector/qmlinspector.cpp
	src/plugins/qmljsinspector/qmljsinspectorcontext.cpp
	src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
parents f31d299d 6dc4a039
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 13776 additions and 2648 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