Mercurial > dotfiles
changeset 234:627ef7152307
Merge changes.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Sun, 30 Nov 2014 08:18:04 -0800 |
parents | 073e7e47dbeb (current diff) ee5863ae54e7 (diff) |
children | ceb3f44fa2fc |
files | .hgsubstate |
diffstat | 2 files changed, 17 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Wed Nov 19 20:23:17 2014 -0800 +++ b/.hgsub Sun Nov 30 08:18:04 2014 -0800 @@ -24,6 +24,7 @@ vim/bundle/yankring = [git]https://github.com/vim-scripts/YankRing.vim.git vim/bundle/linediff = [git]https://github.com/AndrewRadev/linediff.vim.git vim/bundle/pythonmode = [git]https://github.com/klen/python-mode.git +vim/bundle/interestingwords = [git]https://github.com/vasconcelloslf/vim-interestingwords.git vim/bundle/gutentags = https://bitbucket.org/ludovicchabant/vim-gutentags vim/bundle/lawrencium = https://bitbucket.org/ludovicchabant/vim-lawrencium
--- a/.hgsubstate Wed Nov 19 20:23:17 2014 -0800 +++ b/.hgsubstate Sun Nov 30 08:18:04 2014 -0800 @@ -1,31 +1,32 @@ f8703c9e2fb951ebb193b268faf7f0457abf8334 lib/hg/allpaths -81e5e8e0185c2308c639780c54f6d08287f99454 lib/hg/hg-git +9da433130b12820526ed98728d0c73fb6ad1ae78 lib/hg/hg-git 66e2a34005b447d321a96838d7fe2b161e78b7a9 lib/hg/mercurial-cli-templates d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf -f134dd5726732a74e05edacc9a795006b984b82f vim/bundle/colorschemes -a3ae0df1d9e13941e9e8086637055841ce93f7bd vim/bundle/commentary -b5d3fe66a58a13d2ff8b6391f4387608496a030f vim/bundle/ctrlp -868cd71710a48e8ec8acffeabd1eebfb10812c77 vim/bundle/easymotion -c99f0ff06bd1915b2f05c5750283aa9e826ad3d8 vim/bundle/fugitive +81c6dd7ce3169e5ad9ba92422ba6e1ce5b074e36 vim/bundle/colorschemes +9c685131a5facfa0d643feca3a61b41c007d8170 vim/bundle/commentary +ff583ed51f03c8476eb54518b9a07c4a85854944 vim/bundle/ctrlp +2dc0025881c41a8fa37dd17524d6ec5c43b0232a vim/bundle/easymotion +d3b98d988602b94dc705ca99b171bb9f5b6c8a2c vim/bundle/fugitive eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo -3c05154a6b09e0e5b19ad3f2b620d20d79d283f5 vim/bundle/gutentags -33279476a63276cf5858a568283407dd98d7eb74 vim/bundle/haml +cae2a1c22cfd846322e3fd6506d5ade0ed58b9e3 vim/bundle/gutentags +204e32721154766e03e99ff857bc798aa5b741dc vim/bundle/haml +4dfa6c4e679ae326cc7486012f0433a92c64426e vim/bundle/interestingwords e66df94ebcebc5f806c225eb932d53a6449f39c1 vim/bundle/lawrencium -5d965c221b90fb168bf9f447a332c9ff6f62e666 vim/bundle/less +940a8defa0576385dee1ad177bab0b34738540aa vim/bundle/less b69e54f4bf0a0ee26f6582ee8764b25529610c88 vim/bundle/linediff -b02182ebbd9c18f3a4e1761c67cf0be10d9062ec vim/bundle/markdown -b0bb781fc73ef40365e4c996a16f04368d64fc9d vim/bundle/nerdtree +409c37b205afa2f9d590e23de8171482d66770e2 vim/bundle/markdown +f8fd2ecce20f5005e6313ce57d6d2a209890c946 vim/bundle/nerdtree af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline c6a872a64530979f4aac46d765c577581cb7fc36 vim/bundle/pythonmode 12e379989e3258af0934e10173386235c7d69944 vim/bundle/ragtag 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized -7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab -42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround -43e8cb955e7f65d153500bf280902bf26099607e vim/bundle/syntastic -f46ba1a41f2d51e52549fb42ccefc436b1137186 vim/bundle/tagbar +b0ca47f4570385043f270f9278ba6d50d1d2fa00 vim/bundle/supertab +fa433e0b7330753688f715f3be5d10dc480f20e5 vim/bundle/surround +dbc7e39c13ec80252ae46e99061a11a727df87ad vim/bundle/syntastic +a084e47eb47a171910c72ef21cc599c5bc2980a1 vim/bundle/tagbar 869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring