diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-06-25 10:14:14 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2013-06-25 10:14:14 +0200 |
commit | e8469a2babd0553fe1343b91cd904e459d89a2be (patch) | |
tree | cd686e7d27e496fe1373b9f1b87ab02058503707 /src/libs/cplusplus/PreprocessorClient.cpp | |
parent | 72b06779abb99fda119a73990e25632387a7a072 (diff) | |
parent | c59ba462adff332fee2cb333cbb9a87972288011 (diff) | |
download | qt-creator-e8469a2babd0553fe1343b91cd904e459d89a2be.tar.gz |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/plugins/fakevim/fakevimhandler.cpp
Change-Id: I8101f18b87859924644471817d4f1408790d5628
Diffstat (limited to 'src/libs/cplusplus/PreprocessorClient.cpp')
-rw-r--r-- | src/libs/cplusplus/PreprocessorClient.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/cplusplus/PreprocessorClient.cpp b/src/libs/cplusplus/PreprocessorClient.cpp index 7cd95e7810..5028cffd81 100644 --- a/src/libs/cplusplus/PreprocessorClient.cpp +++ b/src/libs/cplusplus/PreprocessorClient.cpp @@ -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. */ /*! |