1
0
mirror of https://github.com/amix/vimrc synced 2025-07-09 02:25:00 +08:00

Merge branch 'master' of https://github.com/amix/vimrc into amix-master

Conflicts:
	.gitignore
This commit is contained in:
qhuang
2014-12-16 10:32:49 +08:00
649 changed files with 48940 additions and 20260 deletions

View File

@ -90,3 +90,7 @@ let g:expand_region_use_select_mode = 1
[Pathogen]:http://github.com/tpope/vim-pathogen
[Vundle]:http://github.com/gmarik/vundle
[Neobundle]:http://github.com/Shougo/neobundle.vim
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/terryma/vim-expand-region/trend.png)](https://bitdeli.com/free "Bitdeli Badge")