diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-15 10:29:19 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-15 10:29:19 -0300 |
commit | 3ed19e74567434fe0bc82d835513b5b62f151838 (patch) | |
tree | 32427be3c933a7d96426b28d9c90eceb6ab8ff3d /community/ristretto | |
parent | d5be0922f99093b4659507a4c17c664ac5c2f577 (diff) | |
parent | 8f1eb849d6de0031d4d91fb6d8780828b1ba924b (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gambas3/PKGBUILD
community-staging/libextractor/PKGBUILD
community/haveged/PKGBUILD
community/libfm/PKGBUILD
core/lvm2/PKGBUILD
extra/geeqie/PKGBUILD
staging/calligra/PKGBUILD
Diffstat (limited to 'community/ristretto')
-rw-r--r-- | community/ristretto/PKGBUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/community/ristretto/PKGBUILD b/community/ristretto/PKGBUILD index 5b3b2a268..249fe361a 100644 --- a/community/ristretto/PKGBUILD +++ b/community/ristretto/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70118 2012-04-30 04:20:02Z foutrelis $ +# $Id: PKGBUILD 75057 2012-08-13 06:21:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> |