Eike Ziller a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD ...

Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9

2013-07-08 15:01:17 +02:00

..

instances

QmlDesigner: Test mode for qml puppet streams

2013-07-08 11:28:38 +02:00

Info.plist.in

Replace com.nokia.qtcreator with org.qt-project.qtcreator

2013-02-07 12:40:37 +01:00

qml2puppet.pri

Fix sources that are deployed into Qt Creator build for qml(2)puppet

2013-06-28 14:22:36 +02:00

qml2puppet.pro

QmlDesigner: fixing .pro file for mac

2013-03-06 15:41:04 +01:00

qml2puppetmain.cpp

Merge remote-tracking branch 'origin/2.8' into HEAD

2013-07-08 15:01:17 +02:00