Merge branch 'mergetest'

This commit is contained in:
Locojay 2011-06-05 20:42:07 -04:00
commit 500ce1d5ca
22 changed files with 973 additions and 597 deletions

View file

@ -46,9 +46,17 @@ alias print-libpath='echo -e ${LD_LIBRARY_PATH//:/\\n}'
alias lsbom='lsbom -f -l -s -pf'
#alias t="$HOME/.local/bin/t --task-dir ~/.tasks --list todo.txt --delete-if-empty"
<<<<<<< HEAD
#alias v.='vim .'
#alias v='vim ~/.vimrc'
#alias VS='vim -S Session.vim'
=======
alias v.='vim .'
alias v='vim ~/.vimrc'
alias VS='vim -S Session.vim'
alias z='vim -o ~/.zshenv ~/.oh-my-zsh/custom/aliases.zsh ~/.zshrc'
>>>>>>> ashleydev/master
alias zs='source ~/.zshrc'