Merge remote-tracking branch 'origin/2.8'

Browse Source

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48

...

This commit is contained in:

Oswald Buddenhagen

2013-08-21 14:39:18 +02:00

parent bf69b4c444 01b3e1fa54

commit c2e90c360b

92 changed files with 5811 additions and 1686 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1204

src/plugins/cpptools/cppcompletion_test.cpp

File diff suppressed because it is too large Load Diff