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

..

boost

Adjust license headers

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

gui

Adjust license headers

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

helper

Adjust license headers

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

multi

debugger: add test code for multi-process debugging

2012-03-28 09:32:00 +02:00

python

debugger: rename manual tests from 'gdbdebugger' to 'debugger'

2011-08-24 13:54:34 +02:00

qquick1

Removed module names from #include directives.

2012-02-15 16:24:46 +01:00

qquick2

Removed module names from #include directives.

2012-02-15 16:24:46 +01:00

script

Adjust license headers

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

simple

Merge remote-tracking branch 'origin/2.6'

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

spacy path

Adjust license headers

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

spacy-file

Adjust license headers

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

debugger.pro

Tests: Make compile.

2011-10-20 16:43:37 +02:00