Merge remote-tracking branch 'origin/master'

This commit is contained in:
Andrew Tomaka 2012-04-21 20:34:18 -04:00
commit 5bee2f493d

View file

@ -3,7 +3,7 @@ alias ls='ls -lav --color=auto'
alias grep='grep --color' alias grep='grep --color'
# editor # editor
alias sublime='nohup /cygdrive/c/Program\ Files/Sublime\ Text\ 2/sublime_text.exe > /dev/null' alias sublime='nohup /cygdrive/c/Program\ Files/Sublime\ Text\ 2/sublime_text.exe > /dev/null &'
# non-standard ssh port # non-standard ssh port
alias vps='ssh vps.p5dev.com -p 60013' alias vps='ssh vps.p5dev.com -p 60013'