diff options
| author |  Tom Willemsen | 2013-01-04 00:06:15 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-01-04 00:06:15 +0100 |
| commit | 12fbc83cc7637548bcefaed1d0b7aea81064c67f (patch) | |
| tree | 7cf66d3804a87e9154479d6d00f72d17002a14bf /.conkerorrc | |
| parent | ef288f8ad6c5fe22161fd55d69792e5d0f340b01 (diff) | |
| parent | 1be69078ad8c1af62de79b80345a72d2b8490b04 (diff) | |
| download | dotfiles-12fbc83cc7637548bcefaed1d0b7aea81064c67f.tar.gz dotfiles-12fbc83cc7637548bcefaed1d0b7aea81064c67f.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/init.el
Diffstat (limited to '.conkerorrc')
| -rw-r--r-- | .conkerorrc/init.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.conkerorrc/init.js b/.conkerorrc/init.js index 939d3a6..6594523 100644 --- a/.conkerorrc/init.js +++ b/.conkerorrc/init.js @@ -98,6 +98,9 @@ define_webjump("github", define_webjump("mdn", "https://developer.mozilla.org/en-US/search?q=%s", $alternative="https://developer.mozilla.org/"); +define_webjump("monsterhunter", + "http://monsterhunter.wikia.com/wiki/index.php?search=%s&fulltext=Search", + $alternative="http://monsterhunter.wikia.com/"); // Archlinux define_webjump("arch/wiki", "https://wiki.archlinux.org/index.php?search=%s", |