diff options
| author | con <[email protected]> | 2010-05-21 16:04:27 +0200 |
|---|---|---|
| committer | con <[email protected]> | 2010-05-21 16:04:27 +0200 |
| commit | e327467a03350a21a08b274cecbee7840f22339d (patch) | |
| tree | 59f47b9dc20431d5d2ef5510a04be3b5727b4bf7 /src/plugins/cvs/cvsplugin.cpp | |
| parent | ec6fc83c5d6865550caf49de67b877d632020e7a (diff) | |
| parent | e9d184155232805d4c82eb164768282fc61fca38 (diff) | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
Diffstat (limited to 'src/plugins/cvs/cvsplugin.cpp')
| -rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 1bdb606be6b..b7f0f461fb0 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -958,7 +958,7 @@ bool CVSPlugin::describe(const QString &repositoryPath, const QString title = QString::fromLatin1("cvs describe %1").arg(commitId); Core::IEditor *newEditor = showOutputInEditor(title, output, VCSBase::DiffOutput, entries.front().file, codec); newEditor->setProperty("describeChange", commitId); - setDiffBaseDirectory(editor, repositoryPath); + setDiffBaseDirectory(newEditor, repositoryPath); } return true; } |