Eike Ziller c4e51e7405 Merge remote-tracking branch 'origin/3.2' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I926bdfc7df6158207cfc07f3c6c591d0a59b7667

2014-08-19 12:34:58 +02:00

37 KiB

Raw Blame History

View Raw