Eike Ziller d5d1c5e394 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42

2012-10-09 11:50:17 +02:00

..

commands

Merge remote-tracking branch 'origin/2.6'

2012-10-05 21:20:50 +02:00

container

Merge remote-tracking branch 'origin/2.6'

2012-10-05 21:20:50 +02:00

html

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

images

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

instances

Merge remote-tracking branch 'origin/2.6'

2012-10-05 21:20:50 +02:00

interfaces

Merge remote-tracking branch 'origin/2.6'

2012-10-05 21:20:50 +02:00

qml2puppet

Merge remote-tracking branch 'origin/2.6'

2012-10-09 11:50:17 +02:00

qmlpuppet

Merge remote-tracking branch 'origin/2.6'

2012-10-09 11:50:17 +02:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

qmlpuppet.pro

QmlDesigner.nodeInstances: improving warnings if building qmlpuppet fails

2011-06-24 16:19:01 +02:00

qmlpuppet.qrc

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00