Eike Ziller 086dd684ab Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/plugins/coreplugin/fileiconprovider.cpp
	src/plugins/cppeditor/cppplugin.cpp
	tests/auto/qml/qmldesigner/coretests/coretests.pro

Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7

2012-10-09 14:27:29 +02:00

..

ast

Adjust license headers

2012-10-05 17:12:56 +02:00

codeformatter

Merge remote-tracking branch 'origin/2.6'

2012-10-05 21:20:50 +02:00

cxx11

Merge remote-tracking branch 'origin/2.6'

2012-10-05 21:20:50 +02:00

findusages

Adjust license headers

2012-10-05 17:12:56 +02:00

lookup

Adjust license headers

2012-10-05 17:12:56 +02:00

misc

Adjust license headers

2012-10-05 17:12:56 +02:00

preprocessor

Adjust license headers

2012-10-05 17:12:56 +02:00

semantic

Adjust license headers

2012-10-05 17:12:56 +02:00

shared

More Nokia -> Digia/QtProject changes

2012-10-09 12:24:24 +02:00

simplifytypes

Adjust license headers

2012-10-05 17:12:56 +02:00

typeprettyprinter

Adjust license headers

2012-10-05 17:12:56 +02:00

cplusplus.pro

Fix semantic of C++ 11 inline namespaces.

2012-02-03 15:37:17 +01:00