Merge branch '3.1' into 3.2

This commit is contained in:
Fredrik Rinnestam 2015-08-18 23:04:04 +02:00
commit f077ec0c8f
2 changed files with 2 additions and 2 deletions

View File

@ -1,3 +1,3 @@
1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2
acff833e0674c68df2bacbabda67b9c5 mplayer-2015-01-20.tar.xz
188e80d01c05398ef57206c3807f8e04 mplayer-2015-08-18.tar.xz
5afb114c52e3cc4f1288754d250c7284 mplayer.conf

View File

@ -6,7 +6,7 @@
# Nice to have: libsdl, libjpeg-turbo, libpng, lame, zlib, libogg, libvorbis, cdparanoia, win32-essential-codecs, faac, x264, libdvdnav, libdca
name=mplayer
version=2015-01-20
version=2015-08-18
release=1
source=(http://crux.nu/~tek/mplayer-$version.tar.xz
http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mplayer.conf)