Skip to content
Snippets Groups Projects
Commit 8c2928e1 authored by Lasse Holmstedt's avatar Lasse Holmstedt
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 

Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.h
parents 4e5089d9 2791cfbd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 106 additions and 35 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