Merge remote-tracking branch 'cadusk/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2013-12-19 17:27:55 +01:00
commit 4ab34ba94c
3 changed files with 17 additions and 7 deletions

View file

@ -50,7 +50,6 @@ plugins=(git)
source $ZSH/oh-my-zsh.sh
zstyle ':completion:*:descriptions' format '%B%d%b'
# User configuration
export PATH=$HOME/bin:/usr/local/bin:$PATH
@ -73,4 +72,4 @@ if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
# export SSH_KEY_PATH="~/.ssh/dsa_id"
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
unsetopt correctall
unsetopt correctall