Oswald Buddenhagen 822233629d Merge remote-tracking branch 'origin/2.5' ...

Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab

2012-04-19 16:13:09 +02:00

4.7 KiB

Raw Blame History

View Raw