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

..

aggregation

Adjust license headers

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

changeset

Adjust license headers

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

cplusplus

Merge remote-tracking branch 'origin/2.6'

2012-11-09 11:20:10 +01:00

debugger

Adjust license headers

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

environment

Adjust license headers

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

extensionsystem

Adjust license headers

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

externaltool

More Nokia -> Digia/QtProject changes

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

fakevim

Adjust license headers

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

filesearch

Adjust license headers

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

generichighlighter

Adjust license headers

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

ioutils

Adjust license headers

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

profilewriter

Merge remote-tracking branch 'origin/2.6'

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

qml

Merge remote-tracking branch 'origin/2.6'

2012-11-09 11:20:10 +01:00

qtcprocess

Adjust license headers

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

utils

Adjust license headers

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

utils_stringutils

Adjust license headers

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

auto.pro

Remove "icheck build" test.

2012-09-07 12:30:25 +02:00

qttest.pri

Qt5: Correct usage of testlib.

2012-11-05 12:58:53 +01:00

qttestrpath.pri

More Nokia -> Digia/QtProject changes

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