Eike Ziller fcc6b11230 Merge remote-tracking branch 'origin/3.4' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Iaff42d30008db13ecb685e5157c82292fe48b038

2015-04-01 11:53:26 +02:00

..

qmldump

Update License

2015-01-16 12:37:56 +01:00

qmlpuppet

Merge remote-tracking branch 'origin/3.4'

2015-04-01 11:53:26 +02:00