Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

This commit is contained in:
Kalle Bronsen 2012-07-11 09:00:01 +02:00
commit 45ed12d091
2 changed files with 2 additions and 2 deletions

View file

@ -29,7 +29,7 @@ alias iminurbase='finger'
alias btw='nice' alias btw='nice'
alias obtw='nohup' alias obtw='nohup'
alias nomz='ps -aux' alias nomz='ps aux'
alias nomnom='killall' alias nomnom='killall'
alias byes='exit' alias byes='exit'

View file

@ -4,6 +4,6 @@
if [[ $('uname') == 'Linux' ]]; then if [[ $('uname') == 'Linux' ]]; then
alias st='/usr/bin/sublime_text&' alias st='/usr/bin/sublime_text&'
elif [[ $('uname') == 'Darwin' ]]; then elif [[ $('uname') == 'Darwin' ]]; then
alias st='open -a /Applications/Sublime Text 2.app' alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
fi fi
alias stt='st .' alias stt='st .'