Eike Ziller 6d1cc58697 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a

2014-05-16 16:54:50 +02:00

..

auto

Merge remote-tracking branch 'origin/3.1'

2014-05-16 16:54:50 +02:00

cpplocators/testdata_basic

CppTools: Locator Tests: Make test data more descriptive

2013-09-13 15:40:55 +02:00

cppmodelmanager

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

cppsymbolsearcher/testdata_basic

CppTools: Fix qualified ids in the symbol searcher

2013-09-13 15:41:02 +02:00

designer

Designer: Insert into correct class for "Go to slot"

2013-11-26 11:52:45 +01:00

locators/testdata_basic

Locator: Allow to filter for path in BaseFileFilter

2013-08-29 08:27:53 +02:00

manual

Cleanup whitespace

2014-05-16 14:27:13 +02:00

qt4projectmanager/test1

Initial import

2008-12-02 12:01:29 +01:00

system

Squish: Using param instead of global var in checkLastBuild()

2014-05-16 15:23:48 +02:00

tools

qmljs: generalize language treatement

2014-01-28 15:01:00 +01:00

tests.pro

fix subprojects re valgrind tests

2013-04-02 17:38:49 +02:00

tests.qbs

Add qbs project files for autotests.

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