feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
This commit is contained in:
con
2010-05-21 16:04:27 +02:00
parent ec6fc83c5d e9d1841552
commit e327467a03
32 changed files with 422 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cvs/cvsplugin.cpp
View File

@@ -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;
}