diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-24 17:45:18 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-24 17:45:18 -0300 |
| commit | 1d281894276f404075d12ab90cdc3dbff7a89cd2 (patch) | |
| tree | 609da5609f9606a1d061c6a1b8fa9d8efc02446e /extra/ffmpeg/PKGBUILD | |
| parent | 905d4583b1cbf6ee0bca36a3c8bebf6552b4cf38 (diff) | |
| parent | 7347bb994a41d021c83e97b503f577f2399302e7 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/collectd/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/xulrunner/PKGBUILD
Diffstat (limited to 'extra/ffmpeg/PKGBUILD')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 1bd7fc9b4..6d1e06693 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 122938 2011-05-07 11:51:04Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> |