diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-12 17:24:29 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-12 17:24:29 -0300 |
| commit | 20325742c50f83cc58e49aa3b8347fde1399d734 (patch) | |
| tree | c165cfbea80913f12dad4d009a70d9fe5e8bfceb /extra/live-media | |
| parent | 42512f0cff006451fa78981bf2f41e819fe96131 (diff) | |
| parent | 6a2547c3f20da8a8df65a8032a01677b74b6ece7 (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
community/mplayer2/PKGBUILD
extra/live-media/PKGBUILD
Diffstat (limited to 'extra/live-media')
| -rw-r--r-- | extra/live-media/PKGBUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 707b85d1e..8b5dbf8b6 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143899 2011-11-30 19:57:03Z giovanni $ +# $Id: PKGBUILD 144603 2011-12-07 21:23:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> |