Eike Ziller 60c22e8549 Merge remote-tracking branch 'origin/4.9' ...

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

Change-Id: I170de608eaae795133105dedb76ae6f93f6e0d92

2019-03-25 11:55:48 +01:00

27 KiB

Raw Blame History

View Raw