Eike Ziller 6efd8e33e2 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I6217662f0c51d04a83f7a85dc5d7c7f25e78e09a

2016-05-13 16:24:37 +02:00

73 KiB

Raw Blame History

View Raw