1
0
mirror of https://github.com/amix/vimrc synced 2025-07-12 22:24:59 +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

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ temp_dirs/yankring_history_v2.txt
sources_forked/yankring/doc/tags
sources_non_forked/tlib/doc/tags
systags
my_configs.vim
tags