summaryrefslogtreecommitdiff
path: root/extra/dvdauthor
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-08-17 12:10:05 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-08-17 12:10:05 +0200
commitf5960fe27a2d814eab2ac7efacd714322c18a7b7 (patch)
tree4961d39c9af71f05b5b6ba9f4a23c47963193d37 /extra/dvdauthor
parent1d26d40c2055019b7eb001251919aa73baae0029 (diff)
parent74952c750361d72d7b2d14179d4e88b6ce0a0c7e (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/bsdiff/PKGBUILD community/drivel/PKGBUILD community/dvdbackup/PKGBUILD community/gdlmm/PKGBUILD community/gnome-phone-manager/PKGBUILD community/highlight/PKGBUILD community/i3-wm/PKGBUILD community/linux-tools/PKGBUILD community/obconf/PKGBUILD community/perl-class-factory-util/PKGBUILD community/python-mpi4py/PKGBUILD community/qupzilla/PKGBUILD community/subtitleeditor/PKGBUILD community/synce-librapi/PKGBUILD community/synce-libsynce/PKGBUILD community/tilda/PKGBUILD core/glibc/PKGBUILD core/iputils/PKGBUILD extra/alsa-tools/PKGBUILD extra/calligra/PKGBUILD extra/imagemagick/PKGBUILD extra/kobodeluxe/PKGBUILD extra/libburn/PKGBUILD extra/libisoburn/PKGBUILD extra/libisofs/PKGBUILD extra/libsamplerate/PKGBUILD extra/mariadb/PKGBUILD extra/maxima/PKGBUILD extra/nasm/PKGBUILD extra/perl-netaddr-ip/PKGBUILD extra/perl-template-toolkit/PKGBUILD extra/putty/PKGBUILD extra/samba/PKGBUILD extra/tk/PKGBUILD extra/vim/PKGBUILD extra/xorg-xprop/PKGBUILD extra/xorg-xwd/PKGBUILD pcr/ams/PKGBUILD pcr/clalsadrv/PKGBUILD
Diffstat (limited to 'extra/dvdauthor')
-rw-r--r--extra/dvdauthor/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD
index faa374c8c..13143c008 100644
--- a/extra/dvdauthor/PKGBUILD
+++ b/extra/dvdauthor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184370 2013-05-06 19:36:57Z foutrelis $
+# $Id: PKGBUILD 192473 2013-08-12 20:25:40Z eric $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Travis Willard <travisw@wmpub.ca>
# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -6,7 +6,7 @@
pkgname=dvdauthor
pkgver=0.7.1
-pkgrel=5
+pkgrel=6
pkgdesc="DVD authoring tools"
arch=('i686' 'x86_64' 'mips64el')
url="http://dvdauthor.sourceforge.net/"