1
0
mirror of https://github.com/amix/vimrc synced 2025-07-12 06:05:01 +08:00

merge to origin

This commit is contained in:
Tiande
2016-06-27 02:30:37 +08:00
parent 5ba4c775d9
commit 881ead4c17
113 changed files with 11333 additions and 3543 deletions

7
.gitignore vendored
View File

@ -1,7 +1,12 @@
temp_dirs/undodir*
temp_dirs/undodir/*
sources_non_forked/ack.vim/.netrwhist
temp_dirs/yankring_history_v2.txt
sources_forked/yankring/doc/tags
sources_non_forked/tlib/doc/tags
<<<<<<< HEAD
=======
sources_non_forked/ctrlp.vim/doc/tags*
my_configs.vim
>>>>>>> 2644909e1e6273e4317a077ef289833e7500be53
tags
.DS_Store