feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
1da50de19cc785e12dee8b2b0bcda6d8845fedd8
qt-creator/share/qtcreator/qml/qmlpuppet/commands
History
Eike Ziller 6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
..
changeauxiliarycommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
changeauxiliarycommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
changebindingscommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
changebindingscommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
changefileurlcommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
changefileurlcommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
changeidscommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
changeidscommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
changenodesourcecommand.cpp
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
changenodesourcecommand.h
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
changestatecommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
changestatecommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
changevaluescommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
changevaluescommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
childrenchangedcommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
childrenchangedcommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
clearscenecommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
clearscenecommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
commands.pri
QmlDesigner.NodeInstances: Add end puppet command
2012-09-25 14:03:33 +02:00
completecomponentcommand.cpp
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
completecomponentcommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
componentcompletedcommand.cpp
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
componentcompletedcommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
createinstancescommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
createinstancescommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
createscenecommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
createscenecommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
endpuppetcommand.cpp
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
endpuppetcommand.h
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
informationchangedcommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
informationchangedcommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
pixmapchangedcommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
pixmapchangedcommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
removeinstancescommand.cpp
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
removeinstancescommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
removepropertiescommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
removepropertiescommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
removesharedmemorycommand.cpp
QmlDesigner.Instances: Refactor the qml2 puppet
2012-09-24 11:46:20 +02:00
removesharedmemorycommand.h
QmlDesigner.NodeInstances: Shared memory for value changes
2012-09-11 15:41:41 +02:00
reparentinstancescommand.cpp
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
reparentinstancescommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
statepreviewimagechangedcommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
statepreviewimagechangedcommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
synchronizecommand.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
synchronizecommand.h
Adjust license headers
2012-10-05 17:12:56 +02:00
tokencommand.cpp
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
tokencommand.h
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
valueschangedcommand.cpp
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
valueschangedcommand.h
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00