diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-26 15:13:41 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-26 15:13:41 -0500 |
| commit | d26fb8dc20ba3b0e6ef535761b3ac5fd8e7b7c70 (patch) | |
| tree | ae84713aa59e8e2eaa4a2a19db89294ea0b4c1cf /extra/vlc/PKGBUILD | |
| parent | 2095d71af1b9e0c1dff405c178a9481d1020ca3e (diff) | |
| parent | 8999fa1750304fb2367fb7743e49e013405e88be (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
community/distcc/PKGBUILD
community/lxtask/PKGBUILD
community/ushare/PKGBUILD
extra/catdoc/PKGBUILD
extra/curl/PKGBUILD
extra/ethstatus/PKGBUILD
extra/ffcall/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/metacity/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/x2x/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
testing/alex/PKGBUILD
testing/ghc/PKGBUILD
testing/haskell-cgi/PKGBUILD
testing/haskell-deepseq/PKGBUILD
testing/haskell-fgl/PKGBUILD
testing/haskell-glut/PKGBUILD
testing/haskell-haskell-src/PKGBUILD
testing/haskell-html/PKGBUILD
testing/haskell-http/PKGBUILD
testing/haskell-hunit/PKGBUILD
testing/haskell-mtl/PKGBUILD
testing/haskell-network/PKGBUILD
testing/haskell-opengl/PKGBUILD
testing/haskell-parallel/PKGBUILD
testing/haskell-parsec/PKGBUILD
testing/haskell-platform/PKGBUILD
testing/haskell-quickcheck/PKGBUILD
testing/haskell-regex-base/PKGBUILD
testing/haskell-regex-compat/PKGBUILD
testing/haskell-regex-posix/PKGBUILD
testing/haskell-stm/PKGBUILD
testing/haskell-syb/PKGBUILD
testing/haskell-text/PKGBUILD
testing/haskell-transformers/PKGBUILD
testing/haskell-xhtml/PKGBUILD
testing/haskell-zlib/PKGBUILD
testing/perl/ChangeLog
testing/perl/PKGBUILD
testing/perl/perlbin.sh
testing/pidgin/PKGBUILD
testing/spamassassin/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 ecdad6626..95361e280 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 126993 2011-06-09 15:41:16Z giovanni $ +# $Id: PKGBUILD 127816 2011-06-18 16:12:17Z 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.10 -pkgrel=2 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" |