Eike Ziller 387f5a7006 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63

2012-11-26 10:52:28 +01:00

..

appwizards

Merge remote-tracking branch 'origin/2.6'

2012-10-25 10:45:58 +02:00

cplusplus-frontend

C++: Clean up dev tools.

2012-11-22 14:11:58 +01:00

cplusplus-tools

Adjust license headers

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

cppquickfix

Adjust license headers

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

debugger

Merge remote-tracking branch 'origin/2.6'

2012-11-26 10:52:28 +01:00

distribution

tests: add a script that runs elflint on all binaries

2009-04-17 09:03:41 +02:00

dockwidgets

Adjust license headers

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

fakevim

Adjust license headers

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

filesystemview/symbolic_links

Don't follow symbolic links in the file system view.

2009-08-31 12:30:54 +02:00

plain-cplusplus

Adjust license headers

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

preprocessor

Adjust license headers

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

process

Adjust license headers

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

proparser

Merge remote-tracking branch 'origin/2.6'

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

qml/testfiles

Adjust license headers

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

qt4projectmanager

Show pro file's subdirectory structure in project tree in non-simple mode.

2009-08-21 14:53:25 +02:00

search

Use the encoding settings when doing multi-file searches.

2010-10-11 14:25:22 +02:00

ssh

Merge remote-tracking branch 'origin/2.6'

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

utils

Get tests compiling again on windows.

2012-04-24 13:51:37 +02:00

manual.pro

Device support: Add test for device manager.

2012-04-27 14:35:58 +02:00