diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java')
-rw-r--r-- | platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java index 1d4fea4c01de..049bde52f582 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java @@ -36,6 +36,8 @@ public interface IdeActions { @NonNls String ACTION_EDITOR_SELECT_WORD_AT_CARET = "EditorSelectWord"; @NonNls String ACTION_EDITOR_UNSELECT_WORD_AT_CARET = "EditorUnSelectWord"; @NonNls String ACTION_EDITOR_BACKSPACE = "EditorBackSpace"; + @NonNls String ACTION_EDITOR_MOVE_CARET_LEFT_WITH_SELECTION = "EditorLeftWithSelection"; + @NonNls String ACTION_EDITOR_MOVE_CARET_RIGHT_WITH_SELECTION = "EditorRightWithSelection"; @NonNls String ACTION_EDITOR_MOVE_CARET_UP = "EditorUp"; @NonNls String ACTION_EDITOR_MOVE_CARET_LEFT = "EditorLeft"; @NonNls String ACTION_EDITOR_MOVE_CARET_DOWN = "EditorDown"; @@ -269,7 +271,7 @@ public interface IdeActions { String ACTION_UNDO = "$Undo"; String ACTION_REDO = "$Redo"; String GROUP_REFACTOR = "RefactoringMenu"; - String SELECTED_CHANGES_ROLLBACK = "RollbackLineStatusChanges"; + String SELECTED_CHANGES_ROLLBACK = "Vcs.RollbackChangedLines"; String CHANGES_VIEW_ROLLBACK = "ChangesView.Rollback"; String CONSOLE_CLEAR_ALL = "ConsoleView.ClearAll"; |