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:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp
This commit is contained in:
hjk
2010-05-27 11:11:53 +02:00
parent 125aaf8615 0b52a873bd
commit 5805788290
34 changed files with 551 additions and 3031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/vcsbase/vcsbaseoutputwindow.cpp
View File

@@ -425,7 +425,7 @@ void VCSBaseOutputWindow::appendData(const QByteArray &data)
void VCSBaseOutputWindow::appendDataSilently(const QByteArray &data)
{
append(QTextCodec::codecForLocale()->toUnicode(data));
appendSilently(QTextCodec::codecForLocale()->toUnicode(data));
}
VCSBaseOutputWindow *VCSBaseOutputWindow::instance()