merge upstream

This commit is contained in:
Carlos Cardoso 2013-11-12 22:43:28 -02:00
commit 7062f131f0
43 changed files with 1662 additions and 52 deletions

View file

@ -1,3 +1,11 @@
#
# Aliases
#
alias ta='tmux attach -t'
alias ts='tmux new-session -s'
alias tl='tmux list-sessions'
# Only run if tmux is actually installed
if which tmux &> /dev/null
then