Merge remote branch 'origin/master'

This commit is contained in:
irengrig
2012-07-23 21:54:12 +04:00
@@ -623,7 +623,7 @@
<typedHandler implementation="com.intellij.codeInsight.lookup.impl.LookupTypedHandler" id="lookup" order="first"/>
<typedHandler implementation="com.intellij.codeInsight.editorActions.CompletionAutoPopupHandler" id="completionAutoPopup" order="first"/>
<typedHandler implementation="com.intellij.codeInsight.editorActions.SelectionQuotingTypedHandler"/>
<typedHandler implementation="com.intellij.codeInsight.editorActions.SelectionQuotingTypedHandler" id="selectionQuoting"/>
<templateCompletionProcessor implementation="com.intellij.codeInsight.template.macro.DirectoryTemplateCompletionProcessor"/>