merge upstream

This commit is contained in:
Carlos Cardoso 2013-11-12 22:43:28 -02:00
commit 7062f131f0
43 changed files with 1662 additions and 52 deletions

6
.gitignore vendored
View file

@ -1,9 +1,9 @@
locals.zsh
log/.zsh_history
projects.zsh
custom/*
!custom/example
!custom/example.zsh
-custom/*
-!custom/example
-!custom/example.zsh
*.swp
*.un~
!custom/example.zshcache