forked from qt-creator/qt-creator
Merge remote branch 'origin/1.3'
Conflicts: src/libs/cplusplus/CheckUndefinedSymbols.cpp src/plugins/qmleditor/qmlcodecompletion.cpp
This commit is contained in:
@@ -784,7 +784,7 @@ void ScriptEditor::contextMenuEvent(QContextMenuEvent *e)
|
||||
|
||||
void ScriptEditor::unCommentSelection()
|
||||
{
|
||||
Core::Utils::unCommentSelection(this);
|
||||
Utils::unCommentSelection(this);
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
|
||||
Reference in New Issue
Block a user