diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-17 10:46:15 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-17 10:46:15 +0100 |
| commit | e30ba9d4c857530c2fbb3cc82236a49676d5ebc9 (patch) | |
| tree | 966498ac914356462e691b8e550ab1f1d069074c /extra/xine-lib | |
| parent | 69f67102b7a02871e32a079ffb789d5fca72a746 (diff) | |
| parent | c6f4cd18ab706868be0eff10327a0dcd58cecdf3 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cantata/PKGBUILD
community/ffmpeg-compat/PKGBUILD
community/v8/PKGBUILD
core/e2fsprogs/PKGBUILD
core/groff/PKGBUILD
core/openssl/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/glpk/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/netcdf/PKGBUILD
extra/octave/PKGBUILD
extra/opal/PKGBUILD
extra/sox/PKGBUILD
extra/x264/PKGBUILD
Diffstat (limited to 'extra/xine-lib')
| -rw-r--r-- | extra/xine-lib/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 379315f4e..0d4f6c233 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175863 2013-01-23 00:12:54Z eric $ +# $Id: PKGBUILD 178143 2013-02-16 22:49:01Z ioni $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.2 -pkgrel=5 +pkgrel=6 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" |