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/ffmpeg | |
| 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/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 5608e5531..fe9445869 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167254 2012-09-29 12:49:31Z ibiru $ +# $Id: PKGBUILD 171263 2012-11-16 23:35:38Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg pkgver=1.0 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') |