Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/theme-and-appearance.zsh
	plugins/tmux/tmux.plugin.zsh
This commit is contained in:
Gaetan Semet 2013-06-05 11:10:38 +02:00
commit 781364a35a
93 changed files with 2479 additions and 315 deletions

View file

@ -33,7 +33,7 @@ fi
# List direcory contents
alias lsa='ls -lah'
alias l='ls -lA1'
#alias l='ls -la'
alias ll='ls -l'
alias la='ls -lA'
alias sl=ls # often screw this up