Merge remote-tracking branch 'upstream/master'

This commit is contained in:
hc 2015-11-04 16:20:52 +08:00
commit 240e08bacb
390 changed files with 23279 additions and 1968 deletions

4
.gitignore vendored
View file

@ -1,8 +1,8 @@
locals.zsh
log/.zsh_history
projects.zsh
custom/*
!custom/example
custom
!custom/plugins/example
!custom/example.zsh
*.swp
!custom/example.zshcache