Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	plugins/jump/jump.plugin.zsh
This commit is contained in:
Gaetan Semet 2016-10-11 21:56:56 +02:00
commit 881a2be64f
70 changed files with 4023 additions and 1021 deletions

View file

@ -98,7 +98,7 @@ if is-at-least 4.2.0; then
_image_fts=(jpg jpeg png gif mng tiff tif xpm)
for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
_media_fts=(ape avi flv mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
_media_fts=(ape avi flv m4a mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
for ft in $_media_fts ; do alias -s $ft=mplayer ; done
#read documents