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

Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0

2013-04-18 09:22:19 +02: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-25 13:35:11 +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-04-02 10:14:54 +02:00

qml2puppet

Merge remote-tracking branch 'origin/2.7'

2013-04-18 09:22:19 +02:00

qmlpuppet

Merge remote-tracking branch 'origin/2.7'

2013-04-18 09:22:19 +02: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