Eike Ziller 7545ce072f Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f

2013-03-04 15:07:19 +01:00

..

aggregation

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

changeset

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

cplusplus

C++: Fix semantic highlighter and tests.

2013-03-04 13:16:50 +01:00

debugger

Debugger: Enforce debug build in auto test

2013-02-14 17:04:58 +01:00

environment

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

extensionsystem

tests: Fix compile for tst_pluginspec

2013-03-01 12:26:36 +01:00

externaltool

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

filesearch

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

generichighlighter

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

ioutils

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

profilewriter

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qml

Incremented year in copyright info

2013-02-01 09:19:26 +01:00

qtcprocess

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

utils

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

utils_stringutils

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

auto.pro

FakeVim: Removed old tests

2013-02-26 20:21:02 +01:00

qttest.pri

Tests: Exclude QT_NO_CAST_FROM_ASCII

2013-01-17 10:02:22 +01:00

qttestrpath.pri

More Nokia -> Digia/QtProject changes

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