# HG changeset patch # User Ludovic Chabant # Date 1446349280 25200 # Node ID bb175816e4c984631e0140d2b45da1924fe8948c # Parent 112900c3f7e4d6b197989b6eddc5affdffcbe7b9# Parent 5744670c5c0ec81010593625c812fd6645797bcf Merge changes. diff -r 112900c3f7e4 -r bb175816e4c9 .hgsub --- a/.hgsub Sat Oct 31 17:36:39 2015 -0700 +++ b/.hgsub Sat Oct 31 20:41:20 2015 -0700 @@ -2,6 +2,7 @@ vim/bundle/gundo = https://bitbucket.org/sjl/gundo.vim vim/bundle/badwolf = https://bitbucket.org/sjl/badwolf +vim/bundle/ag = [git]https://github.com/rking/ag.vim.git vim/bundle/colorschemes = [git]https://github.com/flazz/vim-colorschemes.git vim/bundle/ctrlp = [git]https://github.com/ludovicchabant/ctrlp.vim.git vim/bundle/easymotion = [git]https://github.com/Lokaltog/vim-easymotion.git diff -r 112900c3f7e4 -r bb175816e4c9 .hgsubstate --- a/.hgsubstate Sat Oct 31 17:36:39 2015 -0700 +++ b/.hgsubstate Sat Oct 31 20:41:20 2015 -0700 @@ -10,6 +10,7 @@ 2d9820cf595263bc7c651295b83f02525a23ca4a lib/hg/terse-status 3b23c55eb43849975656dd89e3f35dacd2b93e69 mutt/mutt-colors-solarized 14897c793e0978e88967afbcd2d8e85041febceb pentadactyl/plugins/pintaboard +f755abfb1c4e4e3f59f6cfa25ce16edb5af9e516 vim/bundle/ag db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf 28a989b28457e38df620e4c7ab23e224aff70efe vim/bundle/colorschemes e0f4850d78137a35b9461c530078bd77f39e4dce vim/bundle/commentary diff -r 112900c3f7e4 -r bb175816e4c9 pentadactyl/pentadactylrc --- a/pentadactyl/pentadactylrc Sat Oct 31 17:36:39 2015 -0700 +++ b/pentadactyl/pentadactylrc Sat Oct 31 20:41:20 2015 -0700 @@ -55,6 +55,8 @@ " key sends the ID. WTF. nmap -builtin +nmap -builtin :set guioptions!=T + " DDG FTW set defsearch=duckduckgo