Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
This commit is contained in:
Eike Ziller
2013-06-25 10:14:14 +02:00
376 changed files with 3762 additions and 2070 deletions

View File

@@ -33,7 +33,8 @@ using namespace CPlusPlus;
/*!
\class Client
\brief A notification interface for for C++ preprocessor.
\brief The Client class implements a notification interface for the
C++ preprocessor.
*/
/*!