Eike Ziller c8a2ea5433 Merge remote-tracking branch 'origin/4.12' ...

Conflicts:
	src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp

Change-Id: I2a0ccb84560174c5170d5baaff526c0e095f0ba0

2020-03-19 09:35:50 +01:00

6.4 KiB

Raw Blame History

View Raw