diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
| commit | 4a534f68f38c221a2276fa791e086c3848ce515d (patch) | |
| tree | 7963845c02cde2b1f4a4fb8a6c6cfa497b5ee5d5 /extra/vlc | |
| parent | d5acc51bdb801d2bb930af53220946e739dd5edd (diff) | |
| parent | 738e6c6d93b4c7118e49b38c610abed8b7f7d55a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/calibre/PKGBUILD
community/ffmpeg2theora/PKGBUILD
core/e2fsprogs/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/ffmpeg/PKGBUILD
multilib/lib32-alsa-lib/PKGBUILD
multilib/lib32-alsa-oss/PKGBUILD
multilib/lib32-alsa-plugins/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
staging/transcode/PKGBUILD
staging/vlc/PKGBUILD
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 9551054de..2c2ea6a57 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 145277 2011-12-21 01:41:22Z giovanni $ +# $Id: PKGBUILD 147739 2012-01-27 19:27:41Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.13 -pkgrel=1 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" |