Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into test-pull

Conflicts:
	themes/agnoster.zsh-theme
	tools/install.sh
This commit is contained in:
Aaron Biggs 2014-06-11 08:59:00 -05:00
commit ca14eb83b4
121 changed files with 4113 additions and 1248 deletions

View file

@ -71,7 +71,7 @@ if [ ${ZSH_VERSION//\./} -ge 420 ]; then
_image_fts=(jpg jpeg png gif mng tiff tif xpm)
for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
_media_fts=(avi mpg mpeg ogm mp3 wav ogg ape rm mov mkv)
_media_fts=(ape avi flv mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
for ft in $_media_fts ; do alias -s $ft=mplayer ; done
#read documents