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

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6

2019-04-02 12:22:48 +02:00

54 KiB

Raw Blame History

View Raw