Merge branch 'master' of git@github.com:fred-o/oh-my-zsh

Conflicts:

	.gitignore
This commit is contained in:
Fredrik Appelberg 2011-12-08 10:02:17 +01:00
commit e24230cbfb
3 changed files with 62 additions and 1 deletions

3
.gitignore vendored
View file

@ -4,5 +4,6 @@ projects.zsh
custom/*
!custom/example
!custom/example.zsh
cache
*.swp
!custom/example.zshcache
cache/