Merge remote-tracking branch 'origin/2.7'

Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
This commit is contained in:
Eike Ziller
2013-04-08 13:26:37 +02:00
113 changed files with 5845 additions and 1194 deletions

View File

@@ -160,6 +160,9 @@
a list of all projects open in the current session. The files for each
project are grouped according to their file type.
If the project is under version control, information from the version control system
might be displayed in brackets after the project name. This is currently implemented for
Git (the branch name or a tag is displayed) and ClearCase (the view name is displayed).
You can use the project tree in the following ways: