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

Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104

2013-04-30 11:43:33 +02:00

..

instances

Merge remote-tracking branch 'origin/2.7'

2013-04-30 11:43:33 +02:00

Info.plist.in

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

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

main.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qml2puppet.pri

Fix compilation for Mac OS X

2013-04-17 11:23:33 +02:00

qml2puppet.pro

QmlDesigner: fixing .pro file for mac

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