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

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9

2013-03-08 11:39:33 +01:00

..

instances

QmlDesigner: Fix byte padding

2013-03-05 12:47:10 +01: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

QmlDesigner: fix compile for qml2puppet

2013-02-07 12:45:02 +01:00

qml2puppet.pro

QmlDesigner: fixing .pro file for mac

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