Eike Ziller 4a826ada04 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa

2016-04-22 15:13:58 +02:00

..

qmlpuppet

Merge remote-tracking branch 'origin/4.0'

2016-04-22 15:13:58 +02:00