summaryrefslogtreecommitdiff
path: root/community/ffmpeg2theora
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-01 10:50:46 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-01 10:50:46 -0300
commit3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (patch)
tree05623159a5ae88f6eed2414db216bc9a0d2d71c5 /community/ffmpeg2theora
parentd4157e6db6dd7e03802aa9c361a1902e81c2545a (diff)
parent9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/geany/PKGBUILD community/linux-tools/PKGBUILD community/linux-tools/cpupower.conf community/linux-tools/cpupower.rc community/stk/PKGBUILD core/patch/PKGBUILD core/systemd/PKGBUILD extra/lftp/PKGBUILD extra/lftp/lftp-4.3.8-gets.patch extra/mysql/PKGBUILD extra/qt/PKGBUILD extra/transmission/PKGBUILD gnome-unstable/gcr/PKGBUILD gnome-unstable/glibmm/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/libgdata/PKGBUILD gnome-unstable/libgnome-keyring/PKGBUILD gnome-unstable/pango/PKGBUILD gnome-unstable/polkit/PKGBUILD gnome-unstable/telepathy-glib/PKGBUILD libre/linux-libre/PKGBUILD multilib/lib32-libphobos-ldc/PKGBUILD multilib/wine/PKGBUILD testing/dbus-core/PKGBUILD testing/dbus/PKGBUILD testing/libusbx/PKGBUILD testing/systemd/PKGBUILD testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'community/ffmpeg2theora')
-rw-r--r--community/ffmpeg2theora/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD
index bf9a0c177..7cfa0b279 100644
--- a/community/ffmpeg2theora/PKGBUILD
+++ b/community/ffmpeg2theora/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73471 2012-07-08 09:30:01Z ibiru $
+# $Id: PKGBUILD 76759 2012-09-29 12:51:22Z ibiru $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
pkgname=ffmpeg2theora
pkgver=0.29
-pkgrel=1
+pkgrel=2
pkgdesc="Simple converter to create Ogg Theora files"
arch=('x86_64' 'i686' 'mips64el')
url="http://www.v2v.cc/~j/ffmpeg2theora/"