diff options
| author | Jez Ng | 2013-03-06 04:25:23 -0500 |
|---|---|---|
| committer | Jez Ng | 2013-03-06 04:25:23 -0500 |
| commit | 25c871c9bfc15278d72b9d0b2821b92627a605c6 (patch) | |
| tree | 7936f3212a76b6ef72f5feada6144f2e19b01465 /background_scripts/commands.coffee | |
| parent | 4c5fcc544f016c0f06dfa548bd46bd4f6e46eeda (diff) | |
| parent | 22093e34ab94bbdab4059f197a67f8b57dd0b99e (diff) | |
| download | vimium-25c871c9bfc15278d72b9d0b2821b92627a605c6.tar.bz2 | |
Merge remote-tracking branch 'deiga/patch-4'
Conflicts:
background_scripts/commands.coffee
Diffstat (limited to 'background_scripts/commands.coffee')
| -rw-r--r-- | background_scripts/commands.coffee | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee index 05af51c2..5614e576 100644 --- a/background_scripts/commands.coffee +++ b/background_scripts/commands.coffee @@ -110,7 +110,7 @@ Commands = advancedCommands: [ "scrollToLeft", "scrollToRight", "moveTabToNewWindow", "goUp", "goToRoot", "focusInput", "LinkHints.activateModeWithQueue", - "goPrevious", "goNext", "Marks.activateCreateMode", "Marks.activateGotoMode"] + "LinkHints.activateModeToOpenIncognitoWindow", "goNext", "Marks.activateCreateMode", "Marks.activateGotoMode"] defaultKeyMappings = "?": "showHelp" @@ -217,6 +217,8 @@ commandDescriptions = 'LinkHints.activateModeToOpenInNewTab': ["Open a link in a new tab"] 'LinkHints.activateModeWithQueue': ["Open multiple links in a new tab"] + "LinkHints.activateModeToOpenIncognitoWindow": ["Open a link in incognito window"] + enterFindMode: ["Enter find mode"] performFind: ["Cycle forward to the next find match"] performBackwardsFind: ["Cycle backward to the previous find match"] |