Merge remote branch 'upstream/master'

This commit is contained in:
Dieter Plaetinck 2011-05-02 09:53:00 +02:00
commit 78a682411b
71 changed files with 1898 additions and 129 deletions

View file

@ -1,7 +1,7 @@
# Path to your oh-my-zsh configuration.
ZSH=$HOME/.oh-my-zsh
# Set to the name theme to load.
# Set name of the theme to load.
# Look in ~/.oh-my-zsh/themes/
ZSH_THEME="robbyrussell"
@ -14,6 +14,9 @@ ZSH_THEME="robbyrussell"
# Uncomment following line if you want to disable colors in ls
# DISABLE_LS_COLORS="true"
# Uncomment following line if you want to disable autosetting terminal title.
# DISABLE_AUTO_TITLE="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(git)