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

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9

2013-03-08 11:39:33 +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

tests: let tst_dumpers compile with Qt4

2013-03-06 15:12:20 +01:00

environment

Incremented year in copyright info

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

extensionsystem

Fix tests compilation

2013-03-05 09:01:18 +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

Fix tests compilation

2013-03-05 09:01:18 +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