Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator

2013-04-23 11:16:15 +02:00
parent 38b61177f6 ed1bbafad9
commit 8e1123cdde
1 changed files with 1 additions and 1 deletions
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -1057,7 +1057,7 @@ static inline bool checkChunkLine(const QString &line, int *modifiedLineNumber,
    if (endPos == -1)
        return false;
    // the first chunk range applies to the original file, the second one to
-    // the modified file, the one we're interested int
+    // the modified file, the one we're interested in
    const int plusPos = line.indexOf(QLatin1Char('+'), len);
    if (plusPos == -1 || plusPos > endPos)
        return false;