diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-11 13:39:55 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-11 13:39:55 +0100 |
| commit | 52bf71fbdff62bdcd0c67e0a5edc45b695b3c519 (patch) | |
| tree | a0bcc473630b26eb4aa600b83a916053fd99ef89 /src/plugins/autotoolsprojectmanager | |
| parent | ee299651df3bcfc1c8745dc4e10394b47865f5c8 (diff) | |
| parent | 01715c61722a8cbe3d800759bbd5d590fccdc525 (diff) | |
| download | qt-creator-52bf71fbdff62bdcd0c67e0a5edc45b695b3c519.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
README
tests/auto/debugger/tst_dumpers.cpp
Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
| -rw-r--r-- | src/plugins/autotoolsprojectmanager/makefileparserthread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/autotoolsprojectmanager/makefileparserthread.h b/src/plugins/autotoolsprojectmanager/makefileparserthread.h index fb268497b2..1489fe2e9c 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparserthread.h +++ b/src/plugins/autotoolsprojectmanager/makefileparserthread.h @@ -111,7 +111,7 @@ public: bool hasError() const; /** - * @return True, if the the has been cancelled by MakefileParserThread::cancel(). + * @return True, if the parsing has been cancelled by MakefileParserThread::cancel(). */ bool isCanceled() const; |