diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-17 15:19:29 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-17 15:19:29 +0100 |
commit | a66ad9f55f1788fcab4028fefb2c91e563fec35c (patch) | |
tree | 93e3cfd6d5cee5dc334cd6582c789b1429f23694 /extra/vlc/PKGBUILD | |
parent | 36128f354db7ef055305ffd69c29af225c6ca182 (diff) | |
parent | 071ecd58a9b69020ec170e7f89009a603e885371 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/keepassx/PKGBUILD
core/iputils/PKGBUILD
extra/avidemux/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kismet/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
extra/sound-juicer/PKGBUILD
extra/wxgtk/PKGBUILD
kde-unstable/akonadi/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
Diffstat (limited to 'extra/vlc/PKGBUILD')
-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 f23c9fd41..0a3ceae07 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 170110 2012-11-02 09:09:21Z giovanni $ +# $Id: PKGBUILD 171268 2012-11-16 23:35:53Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" |