Eike Ziller 5c87432260 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f

2016-04-12 11:34:46 +02:00

2.3 KiB

Raw Blame History

View Raw