Merge remote-tracking branch 'origin/master'

This commit is contained in:
Konstantin Bulenkov
2016-02-01 11:39:18 +01:00
@@ -76,13 +76,17 @@
<action id="EditorMoveToPageBottom" />
<action id="EditorMoveToPageTop" />
<action id="EditorNextWordWithSelection">
<keyboard-shortcut first-keystroke="shift alt RIGHT" />
<keyboard-shortcut first-keystroke="shift control RIGHT" />
</action>
<action id="EditorPreviousWordWithSelection">
<keyboard-shortcut first-keystroke="shift alt LEFT" />
<keyboard-shortcut first-keystroke="shift control LEFT" />
</action>
<action id="MoveElementLeft">
<keyboard-shortcut first-keystroke="alt shift LEFT"/>
</action>
<action id="MoveElementRight">
<keyboard-shortcut first-keystroke="alt shift RIGHT"/>
</action>
<action id="EditorSelectWord">
<keyboard-shortcut first-keystroke="shift alt UP" />
</action>
@@ -361,7 +365,5 @@
<action id="EditorMatchBrace">
<keyboard-shortcut first-keystroke="shift control P" />
</action>
<action id="MoveElementLeft"/>
<action id="MoveElementRight"/>
</keymap>
</component>