From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Sun, 1 Aug 2010 19:20:14 +0000 (-0700)
Subject: Merge branch 'master' of unix.club.cc.cmu.edu:~/git/pub/cmccabe-etc
X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01e609d08dbd1c3b8fd46bad893bdaa88c499f0f;p=cmccabe-etc

Merge branch 'master' of unix.club.cc.cmu.edu:~/git/pub/cmccabe-etc
---

01e609d08dbd1c3b8fd46bad893bdaa88c499f0f
diff --cc .bashrc
index 01909c2,b068fca..6226e6d
--- a/.bashrc
+++ b/.bashrc
@@@ -12,14 -27,7 +27,13 @@@ case $- i
  	alias mv='mv -i'
  	alias vi='vim'
  	alias wget='wget --user-agent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"'
- 	alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
  	alias grep='grep --color=tty -d skip'
 +	alias mplayer2="mplayer -fs \
 +-vo gl2 \
 +-dr -noslices -xineramascreen 1"
 +	alias mplayer="mplayer -fs \
 +-vo gl:yuv=2:noati-hack:rectangle=0:noaspect \
 +-dr -noslices -xineramascreen 1"
  	export PATH="${PATH}:${HOME}/cmccabe-bin"
  	export EDITOR="/usr/bin/vim"
  	export CSCOPE_EDITOR="${EDITOR}"