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-06-13 17:13:13 +02:00
commit 60f4ae1bed
4 changed files with 13 additions and 11 deletions

View file

@ -36,6 +36,7 @@ alias lsa='ls -lah'
#alias l='ls -la'
alias ll='ls -l'
alias la='ls -lA'
alias l=la
alias sl=ls # often screw this up
alias afind='ack-grep -il'