summaryrefslogtreecommitdiff
path: root/extra/emacs
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-10-28 13:23:06 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-10-28 13:23:06 +0100
commitb1bde86b7410654132cd3365cc82e2ab7306b5f7 (patch)
treecdd900b7b62d0bf35c9b980ab71e0474d604bd72 /extra/emacs
parent6fee6e650c46dcf94e9bd79efa2b2bf8a298d271 (diff)
parent24d0263a0ac516ccc86df09146449fb040fb3689 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/gmic/PKGBUILD community/projectm/PKGBUILD extra/dvdauthor/PKGBUILD extra/ilmbase/PKGBUILD extra/imagemagick/PKGBUILD extra/obex-data-server/PKGBUILD extra/phonon/PKGBUILD extra/psiconv/PKGBUILD extra/pstoedit/PKGBUILD
Diffstat (limited to 'extra/emacs')
-rw-r--r--extra/emacs/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index debbd5c2b..7e9d5f583 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165687 2012-08-29 09:08:38Z juergen $
+# $Id: PKGBUILD 169743 2012-10-27 23:41:39Z eric $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
pkgname=emacs
pkgver=24.2
-pkgrel=1
+pkgrel=2
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/emacs/emacs.html"