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

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7

2014-02-11 09:14:22 +01:00

..

instances

Merge remote-tracking branch 'origin/3.0'

2014-01-08 11:01:06 +01:00

Info.plist.in

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

qml2puppet.pri

QmlDesigner: Refactor enumeration handling

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

qml2puppet.pro

QmlDesigner.QmlPuppet: Adding CONFIG += console

2014-01-22 13:44:16 +01:00

qml2puppetmain.cpp

Incremented year in copyright info

2014-01-08 08:29:47 +01:00