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

Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612

2013-04-11 18:27:52 +02:00

..

instances

Merge remote-tracking branch 'origin/2.7'

2013-04-11 18:27:52 +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 checks for qt modules

2013-03-26 16:41:54 +01:00

qml2puppet.pro

QmlDesigner: fixing .pro file for mac

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