Merge remote branch 'origin/1.3'

Conflicts:
	src/libs/cplusplus/CheckUndefinedSymbols.cpp
	src/plugins/qmleditor/qmlcodecompletion.cpp
This commit is contained in:
Erik Verbruggen
2009-10-06 11:41:00 +02:00
318 changed files with 2873 additions and 1577 deletions

View File

@@ -784,7 +784,7 @@ void ScriptEditor::contextMenuEvent(QContextMenuEvent *e)
void ScriptEditor::unCommentSelection()
{
Core::Utils::unCommentSelection(this);
Utils::unCommentSelection(this);
}
} // namespace Internal