summaryrefslogtreecommitdiff
path: root/community/conkeror-git
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-26 13:21:55 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-26 13:21:55 -0300
commit60e119a0f3297314f4bcd2b2b821eccd28992cd6 (patch)
tree83078f34ba0e5220164fe3f3b5cdff27ce87aaf9 /community/conkeror-git
parent8aa6cf7dacd74c155e7b2dd7af68a5cb4460e5b3 (diff)
parent21efc9511d14394cc1d8426e2e0a6c668964fbe9 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/lightspark/PKGBUILD community/camlp5/PKGBUILD community/gnote/PKGBUILD community/gtk-gnutella/PKGBUILD extra/ffmpeg/PKGBUILD extra/koffice/PKGBUILD extra/pyopenssl/PKGBUILD extra/virtuoso/PKGBUILD gnome-unstable/empathy/PKGBUILD gnome-unstable/epiphany/PKGBUILD gnome-unstable/folks/PKGBUILD gnome-unstable/gdm/PKGBUILD gnome-unstable/gjs/PKGBUILD gnome-unstable/gnome-games/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/gnome-shell/PKGBUILD gnome-unstable/gobject-introspection/PKGBUILD gnome-unstable/gthumb/PKGBUILD gnome-unstable/libgnomekbd/PKGBUILD gnome-unstable/libpeas/PKGBUILD gnome-unstable/mutter/PKGBUILD gnome-unstable/totem/PKGBUILD multilib/lib32-libffi/PKGBUILD multilib/wine/PKGBUILD testing/xorg-server/PKGBUILD
Diffstat (limited to 'community/conkeror-git')
-rw-r--r--community/conkeror-git/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD
index 1eaf9f4ce..d44bd1188 100644
--- a/community/conkeror-git/PKGBUILD
+++ b/community/conkeror-git/PKGBUILD
@@ -1,10 +1,10 @@
# Contributor: Heeru Kiyura <M8R-p9i5nh@mailinator.com>
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-_commit=0b48f8c21f90f26e78f06c15e144d85683981b85
+_commit=c53588e0e42330f65e8c3be41900900da17a7eda
pkgname=conkeror-git
pkgver=1.0pre
-pkgrel=1
+pkgrel=2
pkgdesc="A highly programmable web browser based on Mozilla XULRunner."
arch=('i686' 'x86_64' 'mips64el')
url="http://conkeror.mozdev.org/"