ultimate-vim/.gitignore

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
merge to origin 2016-06-26 14:30:37 -04:00			`temp_dirs/undodir/*`
Updated all plugins that are non-forked. Added some new plugins. Added update_plugins.py which can fetch new plugins from GitHub. New plugins added: zencoding, vim-indent-object, taglist, nginx.vim 2013-04-13 13:45:21 -04:00			`sources_non_forked/ack.vim/.netrwhist`
			`temp_dirs/yankring_history_v2.txt`
Ignore docs tags 2013-04-13 17:35:25 -04:00			`sources_forked/yankring/doc/tags`
			`sources_non_forked/tlib/doc/tags`
merge to origin 2016-06-26 14:30:37 -04:00			`<<<<<<< HEAD`
			`=======`
			`sources_non_forked/ctrlp.vim/doc/tags*`
			`my_configs.vim`
			`>>>>>>> 2644909e1e6273e4317a077ef289833e7500be53`
Updated gitignore 2013-12-29 09:13:35 -05:00			`tags`
update to the origin(amix/vimrc) 2015-12-25 06:48:01 -05:00			`.DS_Store`