Eike Ziller 56aadc407d Merge remote-tracking branch 'origin/3.3' ...

Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602

2015-02-12 17:36:29 +01:00

..

data

CppTools: Tests: Stop writing into source dir

2014-12-19 10:29:16 +01:00

preprocessor.pro

use DISTFILES instead of OTHER_FILES in creator's own build system

2014-09-15 12:10:01 +02:00

preprocessor.qbs

Add qbs project files for autotests.

2013-09-09 12:16:09 +02:00

tst_preprocessor.cpp

Merge remote-tracking branch 'origin/3.3'

2015-02-12 17:36:29 +01:00