• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/2.6' · 6faede08
    Eike Ziller authored
    Conflicts:
    	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
    	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
    	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
    	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
    	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
    	src/plugins/git/gitsettings.cpp
    	tests/manual/ssh/remoteprocess/remoteprocesstest.h
    
    Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
    6faede08
nodeinstanceclientproxy.cpp 12.1 KB