Eike Ziller f60873a24f Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9

2013-03-08 11:39:33 +01:00

..

commands

QmlDesigner: fix compile for qml2puppet

2013-02-07 12:45:02 +01:00

container

QmlDesigner: Type of the propertyname is now PropertyName

2013-03-05 12:34:39 +01: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'

2013-01-31 16:25:33 +01:00

interfaces

QmlDesigner: Fix compile warning

2013-03-06 15:14:56 +01:00

qml2puppet

Merge remote-tracking branch 'origin/2.7'

2013-03-08 11:39:33 +01:00

qmlpuppet

Merge remote-tracking branch 'origin/2.7'

2013-03-08 11:39:33 +01:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

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

qmlpuppet.qrc

QmlDesigner.NodeInstances: Move qmlpuppet to share

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