Merge remote-tracking branch 'cadusk/master'

Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2013-11-18 14:57:43 +01:00
commit 412a38a989
4 changed files with 7 additions and 2 deletions

View file

@ -43,6 +43,7 @@ if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
unsetopt correctall
[ "$TERM" = "xterm" ] && TERM="xterm-256color"