Merge remote-tracking branch 'upstream/master'

This commit is contained in:
仲由 2014-12-03 13:46:59 +08:00
commit b1e7416bd4
8 changed files with 15 additions and 19 deletions

View file

@ -47,13 +47,13 @@ CASE_SENSITIVE="true"
# Add wisely, as too many plugins slow down shell startup.
plugins=(git)
source $ZSH/oh-my-zsh.sh
# User configuration
export PATH=$HOME/bin:/usr/local/bin:$PATH
# export MANPATH="/usr/local/man:$MANPATH"
source $ZSH/oh-my-zsh.sh
# You may need to manually set your language environment
# export LANG=en_US.UTF-8