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

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70

2012-11-09 11:20:10 +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-09 11:20:10 +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