Eike Ziller e035ae6df1 Merge remote-tracking branch 'origin/3.0' ...

Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd

2013-12-18 11:02:16 +01:00

..

instances

Merge remote-tracking branch 'origin/3.0'

2013-12-18 11:02:16 +01:00

Info.plist.in

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

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

qml2puppet.pri

QmlDesigner: Refactor enumeration handling

2013-12-16 12:55:06 +01:00

qml2puppet.pro

QmlDesigner: fixing .pro file for mac

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

qml2puppetmain.cpp

QmlDesigner: Change version number of the puppet to 2

2013-11-18 12:42:04 +01:00