Merge branch '2.8' into 3.0

2013-01-11 22:02:51 +01:00 · 2013-01-11 22:02:51 +01:00 · bec150e631
commit bec150e631
parent fd2ceb8282 bbfaa9db82
4 changed files with 4 additions and 4 deletions
--- a/mplayer/.md5sum
+++ b/mplayer/.md5sum
@ -1,3 +1,3 @@
 1ecd31d17b51f16332b1fcc7da36b312  font-arial-iso-8859-1.tar.bz2
-9fa31770f6f68ba9f2ecae9e5b9d146b  mplayer-2012-12-23.tar.bz2
+c72614f7e1a3485db7b6f8a9ba4a49de  mplayer-2013-01-10.tar.bz2
 c64631601912913f3e5dfbecc3b79d44  mplayer.conf
--- a/mplayer/Pkgfile
+++ b/mplayer/Pkgfile
@ -6,7 +6,7 @@
 # Nice to have: libsdl, libjpeg, libpng, lame, zlib, libogg, libvorbis, cdparanoia, win32-essential-codecs, faac, x264, libdvdnav, libdca

 name=mplayer
-version=2012-12-23
+version=2013-01-10
 release=1
 source=(http://crux.nu/~tek/mplayer-$version.tar.bz2
  http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
--- a/xterm/.md5sum
+++ b/xterm/.md5sum
@ -1,2 +1,2 @@
 2bc971a1753fe57aca05fde7c005a16c  configure.diff
-0e4385e66d40b5dd6017d02c3db2a4af  xterm-287.tgz
+b9bef1abf6e397be6fa2e5f534964d17  xterm-288.tgz
--- a/xterm/Pkgfile
+++ b/xterm/Pkgfile
@ -5,7 +5,7 @@
 # Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc

 name=xterm
-version=287
+version=288
 release=1
 source=(ftp://invisible-island.net/$name/$name-$version.tgz \
        configure.diff)