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

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1

2014-08-15 16:14:34 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/3.2'

2014-08-15 16:14:34 +02:00

share.pro

Include qbs files in qmake project tree

2012-10-16 12:07:53 +02:00

share.qbs

use new base import style in qbs files

2014-03-11 14:20:22 +01:00